X-Git-Url: http://git.cyclocoop.org/%27%20.%20%24prefix%20.%20Wiki::transformTitleToURI%28%24matches%5B1%5D%29%20.%20%27?a=blobdiff_plain;f=includes%2FArticle.php;h=5b56bd46330f87b5698ff82430ba239552a29b01;hb=74a21f3bd1692dac958ddf3e09226a72b7bc65b7;hp=9e6545a18cc015f1ca1b24f6979f3810708f7391;hpb=785ad24aa7ba7c3f50758831e761b4c8bd0dd2df;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Article.php b/includes/Article.php index 9e6545a18c..5b56bd4633 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -11,37 +11,38 @@ * Note: edit user interface and cache support functions have been * moved to separate EditPage and HTMLFileCache classes. * + * @internal documentation reviewed 15 Mar 2010 */ class Article { /**@{{ * @private */ - var $mComment = ''; //!< - var $mContent; //!< - var $mContentLoaded = false; //!< - var $mCounter = -1; //!< Not loaded - var $mCurID = -1; //!< Not loaded - var $mDataLoaded = false; //!< - var $mForUpdate = false; //!< - var $mGoodAdjustment = 0; //!< - var $mIsRedirect = false; //!< - var $mLatest = false; //!< - var $mMinorEdit; //!< - var $mOldId; //!< - var $mPreparedEdit = false; //!< Title object if set - var $mRedirectedFrom = null; //!< Title object if set - var $mRedirectTarget = null; //!< Title object if set - var $mRedirectUrl = false; //!< - var $mRevIdFetched = 0; //!< - var $mRevision; //!< - var $mTimestamp = ''; //!< - var $mTitle; //!< - var $mTotalAdjustment = 0; //!< - var $mTouched = '19700101000000'; //!< - var $mUser = -1; //!< Not loaded - var $mUserText = ''; //!< - var $mParserOptions; //!< - var $mParserOutput; //!< + var $mComment = ''; // !< + var $mContent; // !< + var $mContentLoaded = false; // !< + var $mCounter = -1; // !< Not loaded + var $mCurID = -1; // !< Not loaded + var $mDataLoaded = false; // !< + var $mForUpdate = false; // !< + var $mGoodAdjustment = 0; // !< + var $mIsRedirect = false; // !< + var $mLatest = false; // !< + var $mMinorEdit; // !< + var $mOldId; // !< + var $mPreparedEdit = false; // !< Title object if set + var $mRedirectedFrom = null; // !< Title object if set + var $mRedirectTarget = null; // !< Title object if set + var $mRedirectUrl = false; // !< + var $mRevIdFetched = 0; // !< + var $mRevision; // !< Revision object if set + var $mTimestamp = ''; // !< + var $mTitle; // !< Title object + var $mTotalAdjustment = 0; // !< + var $mTouched = '19700101000000'; // !< + var $mUser = -1; // !< Not loaded + var $mUserText = ''; // !< username from Revision if set + var $mParserOptions; // !< ParserOptions object + var $mParserOutput; // !< ParserCache object if set /**@}}*/ /** @@ -60,7 +61,9 @@ class Article { */ public static function newFromID( $id ) { $t = Title::newFromID( $id ); - return $t == null ? null : new Article( $t ); + # FIXME: doesn't inherit right + return $t == null ? null : new self( $t ); + # return $t == null ? null : new static( $t ); // PHP 5.3 } /** @@ -68,7 +71,7 @@ class Article { * from another page on the wiki. * @param $from Title object. */ - public function setRedirectedFrom( $from ) { + public function setRedirectedFrom( Title $from ) { $this->mRedirectedFrom = $from; } @@ -80,20 +83,26 @@ class Article { * @return mixed Title object, or null if this page is not a redirect */ public function getRedirectTarget() { - if( !$this->mTitle || !$this->mTitle->isRedirect() ) + if ( !$this->mTitle || !$this->mTitle->isRedirect() ) { return null; - if( !is_null($this->mRedirectTarget) ) + } + + if ( !is_null( $this->mRedirectTarget ) ) { return $this->mRedirectTarget; + } + # Query the redirect table $dbr = wfGetDB( DB_SLAVE ); $row = $dbr->selectRow( 'redirect', - array('rd_namespace', 'rd_title'), - array('rd_from' => $this->getID() ), + array( 'rd_namespace', 'rd_title' ), + array( 'rd_from' => $this->getID() ), __METHOD__ ); - if( $row ) { - return $this->mRedirectTarget = Title::makeTitle($row->rd_namespace, $row->rd_title); + + if ( $row ) { + return $this->mRedirectTarget = Title::makeTitle( $row->rd_namespace, $row->rd_title ); } + # This page doesn't have an entry in the redirect table return $this->mRedirectTarget = $this->insertRedirect(); } @@ -106,11 +115,13 @@ class Article { */ public function insertRedirect() { $retval = Title::newFromRedirect( $this->getContent() ); - if( !$retval ) { + + if ( !$retval ) { return null; } + $dbw = wfGetDB( DB_MASTER ); - $dbw->replace( 'redirect', array('rd_from'), + $dbw->replace( 'redirect', array( 'rd_from' ), array( 'rd_from' => $this->getID(), 'rd_namespace' => $retval->getNamespace(), @@ -118,6 +129,7 @@ class Article { ), __METHOD__ ); + return $retval; } @@ -128,20 +140,23 @@ class Article { */ public function followRedirect() { $text = $this->getContent(); + return $this->followRedirectText( $text ); } /** * Get the Title object this text redirects to * + * @param $text string article content containing redirect info * @return mixed false, Title of in-wiki target, or string with URL */ public function followRedirectText( $text ) { $rt = Title::newFromRedirectRecurse( $text ); // recurse through to only get the final target # process if title object is valid and not special:userlogout - if( $rt ) { - if( $rt->getInterwiki() != '' ) { - if( $rt->isLocal() ) { + + if ( $rt ) { + if ( $rt->getInterwiki() != '' ) { + if ( $rt->isLocal() ) { // Offsite wikis need an HTTP redirect. // // This can be hard to reverse and may produce loops, @@ -150,27 +165,30 @@ class Article { return $rt->getFullURL( 'rdfrom=' . urlencode( $source ) ); } } else { - if( $rt->getNamespace() == NS_SPECIAL ) { + if ( $rt->getNamespace() == NS_SPECIAL ) { // Gotta handle redirects to special pages differently: // Fill the HTTP response "Location" header and ignore // the rest of the page we're on. // // This can be hard to reverse, so they may be disabled. - if( $rt->isSpecial( 'Userlogout' ) ) { + if ( $rt->isSpecial( 'Userlogout' ) ) { // rolleyes } else { return $rt->getFullURL(); } } + return $rt; } } + // No or invalid redirect return false; } /** * get the title object of the article + * @return Title object of current title */ public function getTitle() { return $this->mTitle; @@ -205,28 +223,33 @@ class Article { * the shortcut in Article::followContent() * * @return Return the text of this revision - */ + */ public function getContent() { global $wgUser, $wgContLang, $wgOut, $wgMessageCache; + wfProfileIn( __METHOD__ ); - if( $this->getID() === 0 ) { + + if ( $this->getID() === 0 ) { # If this is a MediaWiki:x message, then load the messages # and return the message value for x. - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { # If this is a system message, get the default text. list( $message, $lang ) = $wgMessageCache->figureMessage( $wgContLang->lcfirst( $this->mTitle->getText() ) ); $wgMessageCache->loadAllMessages( $lang ); $text = wfMsgGetKey( $message, false, $lang, false ); - if( wfEmptyMsg( $message, $text ) ) + + if ( wfEmptyMsg( $message, $text ) ) $text = ''; } else { $text = wfMsgExt( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon', 'parsemag' ); } wfProfileOut( __METHOD__ ); + return $text; } else { $this->loadContent(); wfProfileOut( __METHOD__ ); + return $this->mContent; } } @@ -235,14 +258,16 @@ class Article { * Get the text of the current revision. No side-effects... * * @return Return the text of the current revision - */ + */ public function getRawText() { // Check process cache for current revision - if( $this->mContentLoaded && $this->mOldId == 0 ) { + if ( $this->mContentLoaded && $this->mOldId == 0 ) { return $this->mContent; } + $rev = Revision::newFromTitle( $this->mTitle ); $text = $rev ? $rev->getRawText() : false; + return $text; } @@ -260,6 +285,7 @@ class Article { */ public function getSection( $text, $section ) { global $wgParser; + return $wgParser->getSection( $text, $section ); } @@ -275,13 +301,18 @@ class Article { $undo_text = $undo->getText(); $undoafter_text = $undoafter->getText(); $cur_text = $this->getContent(); + if ( $cur_text == $undo_text ) { # No use doing a merge if it's just a straight revert. return $undoafter_text; } + $undone_text = ''; - if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) + + if ( !wfMerge( $undo_text, $undoafter_text, $cur_text, $undone_text ) ) { return false; + } + return $undone_text; } @@ -290,9 +321,10 @@ class Article { * current revision */ public function getOldID() { - if( is_null( $this->mOldId ) ) { + if ( is_null( $this->mOldId ) ) { $this->mOldId = $this->getOldIDFromRequest(); } + return $this->mOldId; } @@ -303,27 +335,32 @@ class Article { */ public function getOldIDFromRequest() { global $wgRequest; + $this->mRedirectUrl = false; + $oldid = $wgRequest->getVal( 'oldid' ); - if( isset( $oldid ) ) { + + if ( isset( $oldid ) ) { $oldid = intval( $oldid ); - if( $wgRequest->getVal( 'direction' ) == 'next' ) { + if ( $wgRequest->getVal( 'direction' ) == 'next' ) { $nextid = $this->mTitle->getNextRevisionID( $oldid ); - if( $nextid ) { + if ( $nextid ) { $oldid = $nextid; } else { $this->mRedirectUrl = $this->mTitle->getFullURL( 'redirect=no' ); } - } elseif( $wgRequest->getVal( 'direction' ) == 'prev' ) { + } elseif ( $wgRequest->getVal( 'direction' ) == 'prev' ) { $previd = $this->mTitle->getPreviousRevisionID( $oldid ); - if( $previd ) { + if ( $previd ) { $oldid = $previd; } } } - if( !$oldid ) { + + if ( !$oldid ) { $oldid = 0; } + return $oldid; } @@ -331,22 +368,27 @@ class Article { * Load the revision (including text) into this object */ function loadContent() { - if( $this->mContentLoaded ) return; + if ( $this->mContentLoaded ) { + return; + } + wfProfileIn( __METHOD__ ); + # Query variables :P $oldid = $this->getOldID(); # Pre-fill content with error message so that if something # fails we'll have something telling us what we intended. $this->mOldId = $oldid; $this->fetchContent( $oldid ); + wfProfileOut( __METHOD__ ); } - /** * Fetch a page record with the given conditions * @param $dbr Database object * @param $conditions Array + * @return mixed Database result resource, or false on failure */ protected function pageData( $dbr, $conditions ) { $fields = array( @@ -362,20 +404,28 @@ class Article { 'page_latest', 'page_len', ); + wfRunHooks( 'ArticlePageDataBefore', array( &$this, &$fields ) ); + $row = $dbr->selectRow( 'page', $fields, $conditions, __METHOD__ ); + wfRunHooks( 'ArticlePageDataAfter', array( &$this, &$row ) ); + return $row ; } /** + * Fetch a page record matching the Title object's namespace and title + * using a sanitized title string + * * @param $dbr Database object * @param $title Title object + * @return mixed Database result resource, or false on failure */ public function pageDataFromTitle( $dbr, $title ) { return $this->pageData( $dbr, array( @@ -384,6 +434,8 @@ class Article { } /** + * Fetch a page record matching the requested ID + * * @param $dbr Database * @param $id Integer */ @@ -398,13 +450,14 @@ class Article { * @param $data Database row object or "fromdb" */ public function loadPageData( $data = 'fromdb' ) { - if( $data === 'fromdb' ) { + if ( $data === 'fromdb' ) { $dbr = wfGetDB( DB_MASTER ); $data = $this->pageDataFromId( $dbr, $this->getId() ); } $lc = LinkCache::singleton(); - if( $data ) { + + if ( $data ) { $lc->addGoodLinkObj( $data->page_id, $this->mTitle, $data->page_len, $data->page_is_redirect ); $this->mTitle->mArticleID = intval( $data->page_id ); @@ -417,23 +470,24 @@ class Article { $this->mIsRedirect = intval( $data->page_is_redirect ); $this->mLatest = intval( $data->page_latest ); } else { - if( is_object( $this->mTitle ) ) { + if ( is_object( $this->mTitle ) ) { $lc->addBadLinkObj( $this->mTitle ); } $this->mTitle->mArticleID = 0; } - $this->mDataLoaded = true; + $this->mDataLoaded = true; } /** * Get text of an article from database * Does *NOT* follow redirects. + * * @param $oldid Int: 0 for whatever the latest revision is - * @return string + * @return mixed string containing article contents, or false if null */ function fetchContent( $oldid = 0 ) { - if( $this->mContentLoaded ) { + if ( $this->mContentLoaded ) { return $this->mContent; } @@ -445,31 +499,36 @@ class Article { $d = $oldid ? wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid ) : ''; $this->mContent = wfMsgNoTrans( 'missing-article', $t, $d ) ; - if( $oldid ) { + if ( $oldid ) { $revision = Revision::newFromId( $oldid ); - if( is_null( $revision ) ) { - wfDebug( __METHOD__." failed to retrieve specified revision, id $oldid\n" ); + if ( is_null( $revision ) ) { + wfDebug( __METHOD__ . " failed to retrieve specified revision, id $oldid\n" ); return false; } + $data = $this->pageDataFromId( $dbr, $revision->getPage() ); - if( !$data ) { - wfDebug( __METHOD__." failed to get page data linked to revision id $oldid\n" ); + + if ( !$data ) { + wfDebug( __METHOD__ . " failed to get page data linked to revision id $oldid\n" ); return false; } + $this->mTitle = Title::makeTitle( $data->page_namespace, $data->page_title ); $this->loadPageData( $data ); } else { - if( !$this->mDataLoaded ) { + if ( !$this->mDataLoaded ) { $data = $this->pageDataFromTitle( $dbr, $this->mTitle ); - if( !$data ) { - wfDebug( __METHOD__." failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" ); + + if ( !$data ) { + wfDebug( __METHOD__ . " failed to find page data for title " . $this->mTitle->getPrefixedText() . "\n" ); return false; } + $this->loadPageData( $data ); } $revision = Revision::newFromId( $this->mLatest ); - if( is_null( $revision ) ) { - wfDebug( __METHOD__." failed to retrieve current page, rev_id {$this->mLatest}\n" ); + if ( is_null( $revision ) ) { + wfDebug( __METHOD__ . " failed to retrieve current page, rev_id {$this->mLatest}\n" ); return false; } } @@ -496,8 +555,9 @@ class Article { * Read/write accessor to select FOR UPDATE * * @param $x Mixed: FIXME + * @return mixed value of $x, or value stored in Article::mForUpdate */ - public function forUpdate( $x = NULL ) { + public function forUpdate( $x = null ) { return wfSetVar( $this->mForUpdate, $x ); } @@ -520,13 +580,14 @@ class Article { * @return Array: options */ protected function getSelectOptions( $options = '' ) { - if( $this->mForUpdate ) { - if( is_array( $options ) ) { + if ( $this->mForUpdate ) { + if ( is_array( $options ) ) { $options[] = 'FOR UPDATE'; } else { $options = 'FOR UPDATE'; } } + return $options; } @@ -534,7 +595,7 @@ class Article { * @return int Page ID */ public function getID() { - if( $this->mTitle ) { + if ( $this->mTitle ) { return $this->mTitle->getArticleID(); } else { return 0; @@ -564,9 +625,10 @@ class Article { * @return int The view count for the page */ public function getCount() { - if( -1 == $this->mCounter ) { + if ( -1 == $this->mCounter ) { $id = $this->getID(); - if( $id == 0 ) { + + if ( $id == 0 ) { $this->mCounter = 0; } else { $dbr = wfGetDB( DB_SLAVE ); @@ -578,11 +640,12 @@ class Article { ); } } + return $this->mCounter; } /** - * Determine whether a page would be suitable for being counted as an + * Determine whether a page would be suitable for being counted as an * article in the site_stats table based on the title & its content * * @param $text String: text to analyze @@ -592,27 +655,30 @@ class Article { global $wgUseCommaCount; $token = $wgUseCommaCount ? ',' : '[['; - return $this->mTitle->isContentPage() && !$this->isRedirect($text) && in_string($token,$text); + + return $this->mTitle->isContentPage() && !$this->isRedirect( $text ) && in_string( $token, $text ); } /** * Tests if the article text represents a redirect * - * @param $text String: FIXME + * @param $text mixed string containing article contents, or boolean * @return bool */ public function isRedirect( $text = false ) { - if( $text === false ) { - if( $this->mDataLoaded ) { + if ( $text === false ) { + if ( $this->mDataLoaded ) { return $this->mIsRedirect; } + // Apparently loadPageData was never called $this->loadContent(); $titleObj = Title::newFromRedirectRecurse( $this->fetchContent() ); } else { $titleObj = Title::newFromRedirect( $text ); } - return $titleObj !== NULL; + + return $titleObj !== null; } /** @@ -622,10 +688,11 @@ class Article { */ public function isCurrent() { # If no oldid, this is the current version. - if( $this->getOldID() == 0 ) { + if ( $this->getOldID() == 0 ) { return true; } - return $this->exists() && isset($this->mRevision) && $this->mRevision->isCurrent(); + + return $this->exists() && isset( $this->mRevision ) && $this->mRevision->isCurrent(); } /** @@ -633,15 +700,18 @@ class Article { * This isn't necessary for all uses, so it's only done if needed. */ protected function loadLastEdit() { - if( -1 != $this->mUser ) + if ( -1 != $this->mUser ) { return; + } # New or non-existent articles have no user information $id = $this->getID(); - if( 0 == $id ) return; + if ( 0 == $id ) { + return; + } $this->mLastRevision = Revision::loadFromPageId( wfGetDB( DB_MASTER ), $id ); - if( !is_null( $this->mLastRevision ) ) { + if ( !is_null( $this->mLastRevision ) ) { $this->mUser = $this->mLastRevision->getUser(); $this->mUserText = $this->mLastRevision->getUserText(); $this->mTimestamp = $this->mLastRevision->getTimestamp(); @@ -651,46 +721,75 @@ class Article { } } + /** + * @return string GMT timestamp of last article revision + **/ + public function getTimestamp() { // Check if the field has been filled by ParserCache::get() - if( !$this->mTimestamp ) { + if ( !$this->mTimestamp ) { $this->loadLastEdit(); } - return wfTimestamp(TS_MW, $this->mTimestamp); + + return wfTimestamp( TS_MW, $this->mTimestamp ); } + /** + * @return int user ID for the user that made the last article revision + */ public function getUser() { $this->loadLastEdit(); + return $this->mUser; } + /** + * @return string username of the user that made the last article revision + */ public function getUserText() { $this->loadLastEdit(); + return $this->mUserText; } + /** + * @return string Comment stored for the last article revision + */ public function getComment() { $this->loadLastEdit(); + return $this->mComment; } + /** + * Returns true if last revision was marked as "minor edit" + * + * @return boolean Minor edit indicator for the last article revision. + */ public function getMinorEdit() { $this->loadLastEdit(); + return $this->mMinorEdit; } - /* Use this to fetch the rev ID used on page views */ + /** + * Use this to fetch the rev ID used on page views + * + * @return int revision ID of last article revision + */ public function getRevIdFetched() { $this->loadLastEdit(); + return $this->mRevIdFetched; } /** * @param $limit Integer: default 0. * @param $offset Integer: default 0. + * @return UserArrayFromResult object with User objects of article contributors for requested range */ - public function getContributors($limit = 0, $offset = 0) { - # XXX: this is expensive; cache this info somewhere. + public function getContributors( $limit = 0, $offset = 0 ) { + # FIXME: this is expensive; cache this info somewhere. $dbr = wfGetDB( DB_SLAVE ); $revTable = $dbr->tableName( 'revision' ); @@ -699,6 +798,7 @@ class Article { $pageId = $this->getId(); $user = $this->getUser(); + if ( $user ) { $excludeCond = "AND rev_user != $user"; } else { @@ -716,8 +816,9 @@ class Article { GROUP BY rev_user, rev_user_text ORDER BY timestamp DESC"; - if ( $limit > 0 ) + if ( $limit > 0 ) { $sql = $dbr->limitResult( $sql, $limit, $offset ); + } $sql .= ' ' . $this->getSelectOptions(); $res = $dbr->query( $sql, __METHOD__ ); @@ -726,9 +827,9 @@ class Article { } /** - * This is the default action of the index.php entry point: just view the + * This is the default action of the index.php entry point: just view the * page of the given title. - */ + */ public function view() { global $wgUser, $wgOut, $wgRequest, $wgContLang; global $wgEnableParserCache, $wgStylePath, $wgParser; @@ -747,34 +848,37 @@ class Article { } # Try client and file cache - if( $oldid === 0 && $this->checkTouched() ) { + if ( $oldid === 0 && $this->checkTouched() ) { global $wgUseETag; - if( $wgUseETag ) { + + if ( $wgUseETag ) { $wgOut->setETag( $parserCache->getETag( $this, $parserOptions ) ); } + # Is is client cached? - if( $wgOut->checkLastModified( $this->getTouched() ) ) { - wfDebug( __METHOD__.": done 304\n" ); + if ( $wgOut->checkLastModified( $this->getTouched() ) ) { + wfDebug( __METHOD__ . ": done 304\n" ); wfProfileOut( __METHOD__ ); + return; # Try file cache - } else if( $wgUseFileCache && $this->tryFileCache() ) { - wfDebug( __METHOD__.": done file cache\n" ); + } else if ( $wgUseFileCache && $this->tryFileCache() ) { + wfDebug( __METHOD__ . ": done file cache\n" ); # tell wgOut that output is taken care of $wgOut->disable(); $this->viewUpdates(); wfProfileOut( __METHOD__ ); + return; } } - $sk = $wgUser->getSkin(); - # getOldID may want us to redirect somewhere else - if( $this->mRedirectUrl ) { + if ( $this->mRedirectUrl ) { $wgOut->redirect( $this->mRedirectUrl ); - wfDebug( __METHOD__.": redirecting due to oldid\n" ); + wfDebug( __METHOD__ . ": redirecting due to oldid\n" ); wfProfileOut( __METHOD__ ); + return; } @@ -783,29 +887,21 @@ class Article { $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); # If we got diff in the query, we want to see a diff page instead of the article. - if( !is_null( $wgRequest->getVal( 'diff' ) ) ) { - wfDebug( __METHOD__.": showing diff page\n" ); + if ( !is_null( $wgRequest->getVal( 'diff' ) ) ) { + wfDebug( __METHOD__ . ": showing diff page\n" ); $this->showDiffPage(); wfProfileOut( __METHOD__ ); + return; } # Should the parser cache be used? $useParserCache = $this->useParserCache( $oldid ); - wfDebug( 'Article::view using parser cache: ' . ($useParserCache ? 'yes' : 'no' ) . "\n" ); - if( $wgUser->getOption( 'stubthreshold' ) ) { + wfDebug( 'Article::view using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" ); + if ( $wgUser->getOption( 'stubthreshold' ) ) { wfIncrStats( 'pcache_miss_stub' ); } - # For the main page, overwrite the
and don't parse $m = array(); preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m ); @@ -988,71 +1104,85 @@ class Article { * array */ public function getRobotPolicyForView() { - wfDeprecated( __FUNC__ ); + wfDeprecated( __METHOD__ ); $policy = $this->getRobotPolicy( 'view' ); + return $policy['index'] . ',' . $policy['follow']; } - + /** * Get the robot policy to be used for the current view * @param $action String the action= GET parameter * @return Array the policy that should be set * TODO: actions other than 'view' */ - public function getRobotPolicy( $action ){ - + public function getRobotPolicy( $action ) { global $wgOut, $wgArticleRobotPolicies, $wgNamespaceRobotPolicies; global $wgDefaultRobotPolicy, $wgRequest; $ns = $this->mTitle->getNamespace(); - if( $ns == NS_USER || $ns == NS_USER_TALK ) { + + if ( $ns == NS_USER || $ns == NS_USER_TALK ) { # Don't index user and user talk pages for blocked users (bug 11443) - if( !$this->mTitle->isSubpage() ) { + if ( !$this->mTitle->isSubpage() ) { $block = new Block(); - if( $block->load( $this->mTitle->getText() ) ) { - return array( 'index' => 'noindex', - 'follow' => 'nofollow' ); + if ( $block->load( $this->mTitle->getText() ) ) { + return array( + 'index' => 'noindex', + 'follow' => 'nofollow' + ); } } } - if( $this->getID() === 0 || $this->getOldID() ) { + if ( $this->getID() === 0 || $this->getOldID() ) { # Non-articles (special pages etc), and old revisions - return array( 'index' => 'noindex', - 'follow' => 'nofollow' ); - } elseif( $wgOut->isPrintable() ) { + return array( + 'index' => 'noindex', + 'follow' => 'nofollow' + ); + } elseif ( $wgOut->isPrintable() ) { # Discourage indexing of printable versions, but encourage following - return array( 'index' => 'noindex', - 'follow' => 'follow' ); - } elseif( $wgRequest->getInt('curid') ) { + return array( + 'index' => 'noindex', + 'follow' => 'follow' + ); + } elseif ( $wgRequest->getInt( 'curid' ) ) { # For ?curid=x urls, disallow indexing - return array( 'index' => 'noindex', - 'follow' => 'follow' ); + return array( + 'index' => 'noindex', + 'follow' => 'follow' + ); } # Otherwise, construct the policy based on the various config variables. $policy = self::formatRobotPolicy( $wgDefaultRobotPolicy ); - if( isset( $wgNamespaceRobotPolicies[$ns] ) ){ + if ( isset( $wgNamespaceRobotPolicies[$ns] ) ) { # Honour customised robot policies for this namespace - $policy = array_merge( $policy, - self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] ) ); + $policy = array_merge( + $policy, + self::formatRobotPolicy( $wgNamespaceRobotPolicies[$ns] ) + ); } - if( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ){ + if ( $this->mTitle->canUseNoindex() && is_object( $this->mParserOutput ) && $this->mParserOutput->getIndexPolicy() ) { # __INDEX__ and __NOINDEX__ magic words, if allowed. Incorporates # a final sanity check that we have really got the parser output. - $policy = array_merge( $policy, - array( 'index' => $this->mParserOutput->getIndexPolicy() ) ); + $policy = array_merge( + $policy, + array( 'index' => $this->mParserOutput->getIndexPolicy() ) + ); } - if( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ){ + if ( isset( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ) { # (bug 14900) site config can override user-defined __INDEX__ or __NOINDEX__ - $policy = array_merge( $policy, - self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) ); + $policy = array_merge( + $policy, + self::formatRobotPolicy( $wgArticleRobotPolicies[$this->mTitle->getPrefixedText()] ) + ); } return $policy; - } /** @@ -1062,10 +1192,10 @@ class Article { * to already-converted arrays, converts String. * @return associative Array: 'index' =>, 'follow' => */ - public static function formatRobotPolicy( $policy ){ - if( is_array( $policy ) ){ + public static function formatRobotPolicy( $policy ) { + if ( is_array( $policy ) ) { return $policy; - } elseif( !$policy ){ + } elseif ( !$policy ) { return array(); } @@ -1073,30 +1203,34 @@ class Article { $policy = array_map( 'trim', $policy ); $arr = array(); - foreach( $policy as $var ){ - if( in_array( $var, array('index','noindex') ) ){ + foreach ( $policy as $var ) { + if ( in_array( $var, array( 'index', 'noindex' ) ) ) { $arr['index'] = $var; - } elseif( in_array( $var, array('follow','nofollow') ) ){ + } elseif ( in_array( $var, array( 'follow', 'nofollow' ) ) ) { $arr['follow'] = $var; } } + return $arr; } /** - * If this request is a redirect view, send "redirected from" subtitle to - * $wgOut. Returns true if the header was needed, false if this is not a + * If this request is a redirect view, send "redirected from" subtitle to + * $wgOut. Returns true if the header was needed, false if this is not a * redirect view. Handles both local and remote redirects. + * + * @return boolean */ public function showRedirectedFromHeader() { global $wgOut, $wgUser, $wgRequest, $wgRedirectSources; $rdfrom = $wgRequest->getVal( 'rdfrom' ); $sk = $wgUser->getSkin(); - if( isset( $this->mRedirectedFrom ) ) { + + if ( isset( $this->mRedirectedFrom ) ) { // This is an internally redirected page view. // We'll need a backlink to the source page for navigation. - if( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) { + if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) { $redir = $sk->link( $this->mRedirectedFrom, null, @@ -1104,11 +1238,12 @@ class Article { array( 'redirect' => 'no' ), array( 'known', 'noclasses' ) ); + $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); $wgOut->setSubtitle( $s ); // Set the fragment if one was specified in the redirect - if( strval( $this->mTitle->getFragment() ) != '' ) { + if ( strval( $this->mTitle->getFragment() ) != '' ) { $fragment = Xml::escapeJsString( $this->mTitle->getFragmentForURL() ); $wgOut->addInlineScript( "redirectToFragment(\"$fragment\");" ); } @@ -1117,31 +1252,35 @@ class Article { $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $this->mTitle->getLocalURL() ) ); + return true; } - } elseif( $rdfrom ) { + } elseif ( $rdfrom ) { // This is an externally redirected view, from some other wiki. // If it was reported from a trusted site, supply a backlink. - if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) { + if ( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) { $redir = $sk->makeExternalLink( $rdfrom, $rdfrom ); $s = wfMsgExt( 'redirectedfrom', array( 'parseinline', 'replaceafter' ), $redir ); $wgOut->setSubtitle( $s ); + return true; } } + return false; } /** - * Show a header specific to the namespace currently being viewed, like + * Show a header specific to the namespace currently being viewed, like * [[MediaWiki:Talkpagetext]]. For Article::view(). */ public function showNamespaceHeader() { global $wgOut; - if( $this->mTitle->isTalkPage() ) { + + if ( $this->mTitle->isTalkPage() ) { $msg = wfMsgNoTrans( 'talkpageheader' ); if ( $msg !== '-' && !wfEmptyMsg( 'talkpageheader', $msg ) ) { - $wgOut->wrapWikiMsg( " \n$1", array( 'talkpageheader' ) ); + $wgOut->wrapWikiMsg( "\n$1\n", array( 'talkpageheader' ) ); } } } @@ -1151,9 +1290,10 @@ class Article { */ public function showViewFooter() { global $wgOut, $wgUseTrackbacks, $wgRequest; + # check if we're displaying a [[User talk:x.x.x.x]] anonymous talk page - if( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) { - $wgOut->addWikiMsg('anontalkpagetext'); + if ( $this->mTitle->getNamespace() == NS_USER_TALK && IP::isValid( $this->mTitle->getText() ) ) { + $wgOut->addWikiMsg( 'anontalkpagetext' ); } # If we have been passed an &rcid= parameter, we want to give the user a @@ -1161,21 +1301,22 @@ class Article { $this->showPatrolFooter(); # Trackbacks - if( $wgUseTrackbacks ) { + if ( $wgUseTrackbacks ) { $this->addTrackbacks(); } } /** - * If patrol is possible, output a patrol UI box. This is called from the - * footer section of ordinary page views. If patrol is not possible or not + * If patrol is possible, output a patrol UI box. This is called from the + * footer section of ordinary page views. If patrol is not possible or not * desired, does nothing. */ public function showPatrolFooter() { global $wgOut, $wgRequest, $wgUser; + $rcid = $wgRequest->getVal( 'rcid' ); - if( !$rcid || !$this->mTitle->exists() || !$this->mTitle->quickUserCan( 'patrol' ) ) { + if ( !$rcid || !$this->mTitle->exists() || !$this->mTitle->quickUserCan( 'patrol' ) ) { return; } @@ -1198,39 +1339,57 @@ class Article { ) . '' ); - } + } /** - * Show the error text for a missing article. For articles in the MediaWiki + * Show the error text for a missing article. For articles in the MediaWiki * namespace, show the default message text. To be called from Article::view(). */ public function showMissingArticle() { global $wgOut, $wgRequest, $wgUser; - # Show info in user (talk) namespace. Does the user exist? + # Show info in user (talk) namespace. Does the user exist? Is he blocked? if ( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) { $parts = explode( '/', $this->mTitle->getText() ); $rootPart = $parts[0]; - $id = User::idFromName( $rootPart ); + $user = User::newFromName( $rootPart, false /* allow IP users*/ ); $ip = User::isIP( $rootPart ); - if ( $id == 0 && !$ip ) { # User does not exist - $wgOut->wrapWikiMsg( '$1', + + if ( !$user->isLoggedIn() && !$ip ) { # User does not exist + $wgOut->wrapWikiMsg( "\n\$1\n", array( 'userpage-userdoesnotexist-view', $rootPart ) ); + } else if ( $user->isBlocked() ) { # Show log extract if the user is currently blocked + LogEventsList::showLogExtract( + $wgOut, + 'block', + $user->getUserPage()->getPrefixedText(), + '', + array( + 'lim' => 1, + 'showIfEmpty' => false, + 'msgKey' => array( + 'blocked-notice-logextract', + $user->getName() # Support GENDER in notice + ) + ) + ); } } + wfRunHooks( 'ShowMissingArticle', array( $this ) ); + # Show delete and move logs LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move' ), $this->mTitle->getPrefixedText(), '', array( 'lim' => 10, 'conds' => array( "log_action != 'revision'" ), 'showIfEmpty' => false, - 'msgKey' => array( 'moveddeleted-notice' ) ) + 'msgKey' => array( 'moveddeleted-notice' ) ) ); # Show error message $oldid = $this->getOldID(); - if( $oldid ) { - $text = wfMsgNoTrans( 'missing-article', + if ( $oldid ) { + $text = wfMsgNoTrans( 'missing-article', $this->mTitle->getPrefixedText(), wfMsgNoTrans( 'missingarticle-rev', $oldid ) ); } elseif ( $this->mTitle->getNamespace() === NS_MEDIAWIKI ) { @@ -1240,59 +1399,70 @@ class Article { $createErrors = $this->mTitle->getUserPermissionsErrors( 'create', $wgUser ); $editErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ); $errors = array_merge( $createErrors, $editErrors ); - - if ( !count($errors) ) + + if ( !count( $errors ) ) { $text = wfMsgNoTrans( 'noarticletext' ); - else + } else { $text = wfMsgNoTrans( 'noarticletext-nopermission' ); + } } $text = "\n$text\n"; - if( !$this->hasViewableContent() ) { + + if ( !$this->hasViewableContent() ) { // If there's no backing content, send a 404 Not Found // for better machine handling of broken links. $wgRequest->response()->header( "HTTP/1.x 404 Not Found" ); } + $wgOut->addWikiText( $text ); } /** - * If the revision requested for view is deleted, check permissions. + * If the revision requested for view is deleted, check permissions. * Send either an error message or a warning header to $wgOut. - * Returns true if the view is allowed, false if not. + * + * @return boolean true if the view is allowed, false if not. */ public function showDeletedRevisionHeader() { global $wgOut, $wgRequest; - if( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { + + if ( !$this->mRevision->isDeleted( Revision::DELETED_TEXT ) ) { // Not deleted return true; } + // If the user is not allowed to see it... - if( !$this->mRevision->userCan(Revision::DELETED_TEXT) ) { - $wgOut->wrapWikiMsg( "\n$1\n", + if ( !$this->mRevision->userCan( Revision::DELETED_TEXT ) ) { + $wgOut->wrapWikiMsg( "\n$1\n\n", 'rev-deleted-text-permission' ); + return false; // If the user needs to confirm that they want to see it... - } else if( $wgRequest->getInt('unhide') != 1 ) { + } else if ( $wgRequest->getInt( 'unhide' ) != 1 ) { # Give explanation and add a link to view the revision... $oldid = intval( $this->getOldID() ); $link = $this->mTitle->getFullUrl( "oldid={$oldid}&unhide=1" ); $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? 'rev-suppressed-text-unhide' : 'rev-deleted-text-unhide'; - $wgOut->wrapWikiMsg( "\n$1\n", - array($msg,$link) ); + $wgOut->wrapWikiMsg( "\n$1\n\n", + array( $msg, $link ) ); + return false; // We are allowed to see... } else { $msg = $this->mRevision->isDeleted( Revision::DELETED_RESTRICTED ) ? 'rev-suppressed-text-view' : 'rev-deleted-text-view'; - $wgOut->wrapWikiMsg( "\n$1\n", $msg ); + $wgOut->wrapWikiMsg( "\n$1\n\n", $msg ); + return true; } } - /* - * Should the parser cache be used? - */ + /** + * Should the parser cache be used? + * + * @return boolean + */ public function useParserCache( $oldid ) { global $wgUser, $wgEnableParserCache; @@ -1309,11 +1479,14 @@ class Article { */ public function doViewParse() { global $wgOut; + $oldid = $this->getOldID(); $useParserCache = $this->useParserCache( $oldid ); $parserOptions = clone $this->getParserOptions(); + # Render printable version, use printable version cache $parserOptions->setIsPrintable( $wgOut->isPrintable() ); + # Don't show section-edit links on old revisions... this way lies madness. $parserOptions->setEditSection( $this->isCurrent() ); $useParserCache = $this->useParserCache( $oldid ); @@ -1321,28 +1494,34 @@ class Article { } /** - * Try to fetch an expired entry from the parser cache. If it is present, - * output it and return true. If it is not present, output nothing and - * return false. This is used as a callback function for + * Try to fetch an expired entry from the parser cache. If it is present, + * output it and return true. If it is not present, output nothing and + * return false. This is used as a callback function for * PoolCounter::executeProtected(). + * + * @return boolean */ public function tryDirtyCache() { + global $wgOut; $parserCache = ParserCache::singleton(); $options = $this->getParserOptions(); $options->setIsPrintable( $wgOut->isPrintable() ); $output = $parserCache->getDirty( $this, $options ); + if ( $output ) { - wfDebug( __METHOD__.": sending dirty output\n" ); + wfDebug( __METHOD__ . ": sending dirty output\n" ); wfDebugLog( 'dirty', "dirty output " . $parserCache->getKey( $this, $options ) . "\n" ); $wgOut->setSquidMaxage( 0 ); $this->mParserOutput = $output; $wgOut->addParserOutput( $output ); $wgOut->addHTML( "\n" ); + return true; } else { wfDebugLog( 'dirty', "dirty missing\n" ); - wfDebug( __METHOD__.": no dirty cache\n" ); + wfDebug( __METHOD__ . ": no dirty cache\n" ); + return false; } } @@ -1353,11 +1532,12 @@ class Article { */ public function showPoolError( $status ) { global $wgOut; + $wgOut->clearHTML(); // for release() errors $wgOut->enableClientCache( false ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiText( - '' . + '' . $status->getWikiText( false, 'view-pool-error' ) . '' ); @@ -1365,28 +1545,34 @@ class Article { /** * View redirect + * * @param $target Title object or Array of destination(s) to redirect * @param $appendSubtitle Boolean [optional] * @param $forceKnown Boolean: should the image be shown as a bluelink regardless of existence? + * @return string containing HMTL with redirect link */ public function viewRedirect( $target, $appendSubtitle = true, $forceKnown = false ) { - global $wgParser, $wgOut, $wgContLang, $wgStylePath, $wgUser; + global $wgOut, $wgContLang, $wgStylePath, $wgUser; + # Display redirect - if( !is_array( $target ) ) { + if ( !is_array( $target ) ) { $target = array( $target ); } + $imageDir = $wgContLang->getDir(); $imageUrl = $wgStylePath . '/common/images/redirect' . $imageDir . '.png'; $imageUrl2 = $wgStylePath . '/common/images/nextredirect' . $imageDir . '.png'; - $alt2 = $wgContLang->isRTL() ? '←' : '→'; // should -> and <- be used instead of entities? + $alt2 = $wgContLang->isRTL() ? 'â' : 'â'; // should -> and <- be used instead of Unicode? - if( $appendSubtitle ) { + if ( $appendSubtitle ) { $wgOut->appendSubtitle( wfMsgHtml( 'redirectpagesub' ) ); } + $sk = $wgUser->getSkin(); // the loop prepends the arrow image before the link, so the first case needs to be outside $title = array_shift( $target ); - if( $forceKnown ) { + + if ( $forceKnown ) { $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ), @@ -1397,10 +1583,11 @@ class Article { } else { $link = $sk->link( $title, htmlspecialchars( $title->getFullText() ) ); } - // automatically append redirect=no to each link, since most of them are redirect pages themselves - foreach( $target as $rt ) { - if( $forceKnown ) { - $link .= '' + + // Automatically append redirect=no to each link, since most of them are redirect pages themselves. + foreach ( $target as $rt ) { + if ( $forceKnown ) { + $link .= '
' . $sk->link( $rt, htmlspecialchars( $rt->getFullText() ), @@ -1409,67 +1596,88 @@ class Article { array( 'known', 'noclasses' ) ); } else { - $link .= '
' + $link .= '
' . $sk->link( $rt, htmlspecialchars( $rt->getFullText() ) ); } } - return '
' . - ''.$link.''; + return '
' . + '' . $link . ''; } + /** + * Builds trackback links for article display if $wgUseTrackbacks is set to true + */ public function addTrackbacks() { global $wgOut, $wgUser; + $dbr = wfGetDB( DB_SLAVE ); $tbs = $dbr->select( 'trackbacks', - array('tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name'), - array('tb_page' => $this->getID() ) + array( 'tb_id', 'tb_title', 'tb_url', 'tb_ex', 'tb_name' ), + array( 'tb_page' => $this->getID() ) ); - if( !$dbr->numRows($tbs) ) return; + + if ( !$dbr->numRows( $tbs ) ) { + return; + } $tbtext = ""; - while( $o = $dbr->fetchObject($tbs) ) { + while ( $o = $dbr->fetchObject( $tbs ) ) { $rmvtxt = ""; - if( $wgUser->isAllowed( 'trackback' ) ) { - $delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid=" . + + if ( $wgUser->isAllowed( 'trackback' ) ) { + $delurl = $this->mTitle->getFullURL( "action=deletetrackback&tbid=" . $o->tb_id . "&token=" . urlencode( $wgUser->editToken() ) ); $rmvtxt = wfMsg( 'trackbackremove', htmlspecialchars( $delurl ) ); } + $tbtext .= "\n"; - $tbtext .= wfMsg(strlen($o->tb_ex) ? 'trackbackexcerpt' : 'trackback', + $tbtext .= wfMsg( strlen( $o->tb_ex ) ? 'trackbackexcerpt' : 'trackback', $o->tb_title, $o->tb_url, $o->tb_ex, $o->tb_name, - $rmvtxt); + $rmvtxt ); } - $wgOut->wrapWikiMsg( "
$1\n", array( 'trackbackbox', $tbtext ) ); - $this->mTitle->invalidateCache(); + + $wgOut->wrapWikiMsg( "\n$1\n\n", array( 'trackbackbox', $tbtext ) ); } + /** + * Removes trackback record for current article from trackbacks table + */ public function deletetrackback() { global $wgUser, $wgRequest, $wgOut; - if( !$wgUser->matchEditToken($wgRequest->getVal('token')) ) { + + if ( !$wgUser->matchEditToken( $wgRequest->getVal( 'token' ) ) ) { $wgOut->addWikiMsg( 'sessionfailure' ); + return; } $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser ); - if( count($permission_errors) ) { + + if ( count( $permission_errors ) ) { $wgOut->showPermissionsErrorPage( $permission_errors ); + return; } $db = wfGetDB( DB_MASTER ); - $db->delete( 'trackbacks', array('tb_id' => $wgRequest->getInt('tbid')) ); + $db->delete( 'trackbacks', array( 'tb_id' => $wgRequest->getInt( 'tbid' ) ) ); $wgOut->addWikiMsg( 'trackbackdeleteok' ); $this->mTitle->invalidateCache(); } + /** + * Handle action=render + */ + public function render() { global $wgOut; - $wgOut->setArticleBodyOnly(true); + + $wgOut->setArticleBodyOnly( true ); $this->view(); } @@ -1478,19 +1686,20 @@ class Article { */ public function purge() { global $wgUser, $wgRequest, $wgOut; - if( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) { - if( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) { + + if ( $wgUser->isAllowed( 'purge' ) || $wgRequest->wasPosted() ) { + if ( wfRunHooks( 'ArticlePurge', array( &$this ) ) ) { $this->doPurge(); $this->view(); } } else { $action = htmlspecialchars( $wgRequest->getRequestURL() ); - $button = wfMsgExt( 'confirm_purge_button', array('escapenoentities') ); + $button = wfMsgExt( 'confirm_purge_button', array( 'escapenoentities' ) ); $form = "\n"; - $top = wfMsgExt( 'confirm-purge-top', array('parse') ); - $bottom = wfMsgExt( 'confirm-purge-bottom', array('parse') ); + $top = wfMsgExt( 'confirm-purge-top', array( 'parse' ) ); + $bottom = wfMsgExt( 'confirm-purge-bottom', array( 'parse' ) ); $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addHTML( $top . $form . $bottom ); @@ -1502,25 +1711,29 @@ class Article { */ public function doPurge() { global $wgUseSquid; + // Invalidate the cache $this->mTitle->invalidateCache(); - if( $wgUseSquid ) { + if ( $wgUseSquid ) { // Commit the transaction before the purge is sent $dbw = wfGetDB( DB_MASTER ); - $dbw->immediateCommit(); + $dbw->commit(); // Send purge $update = SquidUpdate::newSimplePurge( $this->mTitle ); $update->doUpdate(); } - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { global $wgMessageCache; - if( $this->getID() == 0 ) { + + if ( $this->getID() == 0 ) { $text = false; } else { $text = $this->getRawText(); } + $wgMessageCache->replace( $this->mTitle->getDBkey(), $text ); } } @@ -1528,7 +1741,7 @@ class Article { /** * Insert a new empty page record for this article. * This *must* be followed up by creating a revision - * and running $this->updateToLatest( $rev_id ); + * and running $this->updateRevisionOn( ... ); * or else the record will be left in a funky state. * Best if all done inside a transaction. * @@ -1555,11 +1768,13 @@ class Article { ), __METHOD__, 'IGNORE' ); $affected = $dbw->affectedRows(); - if( $affected ) { + + if ( $affected ) { $newid = $dbw->insertId(); $this->mTitle->resetArticleId( $newid ); } wfProfileOut( __METHOD__ ); + return $affected ? $newid : false; } @@ -1574,7 +1789,7 @@ class Article { * Giving 0 indicates the new page flag should be set * on. * @param $lastRevIsRedirect Boolean: if given, will optimize adding and - * removing rows in redirect table. + * removing rows in redirect table. * @return bool true on success, false on failure * @private */ @@ -1585,7 +1800,8 @@ class Article { $rt = Title::newFromRedirect( $text ); $conditions = array( 'page_id' => $this->getId() ); - if( !is_null( $lastRevision ) ) { + + if ( !is_null( $lastRevision ) ) { # An extra check against threads stepping on each other $conditions['page_latest'] = $lastRevision; } @@ -1594,15 +1810,15 @@ class Article { array( /* SET */ 'page_latest' => $revision->getId(), 'page_touched' => $dbw->timestamp(), - 'page_is_new' => ($lastRevision === 0) ? 1 : 0, - 'page_is_redirect' => $rt !== NULL ? 1 : 0, + 'page_is_new' => ( $lastRevision === 0 ) ? 1 : 0, + 'page_is_redirect' => $rt !== null ? 1 : 0, 'page_len' => strlen( $text ), ), $conditions, __METHOD__ ); $result = $dbw->affectedRows() != 0; - if( $result ) { + if ( $result ) { $this->updateRedirectOn( $dbw, $rt, $lastRevIsRedirect ); } @@ -1615,9 +1831,9 @@ class Article { * * @param $dbw Database * @param $redirectTitle a title object pointing to the redirect target, - * or NULL if this is not a redirect + * or NULL if this is not a redirect * @param $lastRevIsRedirect If given, will optimize adding and - * removing rows in redirect table. + * removing rows in redirect table. * @return bool true on success, false on failure * @private */ @@ -1625,10 +1841,11 @@ class Article { // Always update redirects (target link might have changed) // Update/Insert if we don't know if the last revision was a redirect or not // Delete if changing from redirect to non-redirect - $isRedirect = !is_null($redirectTitle); - if($isRedirect || is_null($lastRevIsRedirect) || $lastRevIsRedirect !== $isRedirect) { + $isRedirect = !is_null( $redirectTitle ); + + if ( $isRedirect || is_null( $lastRevIsRedirect ) || $lastRevIsRedirect !== $isRedirect ) { wfProfileIn( __METHOD__ ); - if( $isRedirect ) { + if ( $isRedirect ) { // This title is a redirect, Add/Update row in the redirect table $set = array( /* SET */ 'rd_namespace' => $redirectTitle->getNamespace(), @@ -1639,14 +1856,17 @@ class Article { } else { // This is not a redirect, remove row from redirect table $where = array( 'rd_from' => $this->getId() ); - $dbw->delete( 'redirect', $where, __METHOD__); + $dbw->delete( 'redirect', $where, __METHOD__ ); } - if( $this->getTitle()->getNamespace() == NS_FILE ) { + + if ( $this->getTitle()->getNamespace() == NS_FILE ) { RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() ); } wfProfileOut( __METHOD__ ); + return ( $dbw->affectedRows() != 0 ); } + return true; } @@ -1656,9 +1876,11 @@ class Article { * * @param $dbw Database object * @param $revision Revision object + * @return mixed */ public function updateIfNewerOn( &$dbw, $revision ) { wfProfileIn( __METHOD__ ); + $row = $dbw->selectRow( array( 'revision', 'page' ), array( 'rev_id', 'rev_timestamp', 'page_is_redirect' ), @@ -1666,8 +1888,9 @@ class Article { 'page_id' => $this->getId(), 'page_latest=rev_id' ), __METHOD__ ); - if( $row ) { - if( wfTimestamp(TS_MW, $row->rev_timestamp) >= $revision->getTimestamp() ) { + + if ( $row ) { + if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) { wfProfileOut( __METHOD__ ); return false; } @@ -1678,45 +1901,55 @@ class Article { $prev = 0; $lastRevIsRedirect = null; } + $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect ); + wfProfileOut( __METHOD__ ); return $ret; } /** * @param $section empty/null/false or a section number (0, 1, 2, T1, T2...) + * @param $text String: new text of the section + * @param $summary String: new section's subject, only if $section is 'new' + * @param $edittime String: revision timestamp or null to use the current revision * @return string Complete article text, or null if error */ - public function replaceSection( $section, $text, $summary = '', $edittime = NULL ) { + public function replaceSection( $section, $text, $summary = '', $edittime = null ) { wfProfileIn( __METHOD__ ); - if( strval( $section ) == '' ) { + + if ( strval( $section ) == '' ) { // Whole-page edit; let the whole text through } else { - if( is_null($edittime) ) { + if ( is_null( $edittime ) ) { $rev = Revision::newFromTitle( $this->mTitle ); } else { $dbw = wfGetDB( DB_MASTER ); $rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime ); } - if( !$rev ) { + + if ( !$rev ) { wfDebug( "Article::replaceSection asked for bogus section (page: " . $this->getId() . "; section: $section; edittime: $edittime)\n" ); return null; } + $oldtext = $rev->getText(); - if( $section == 'new' ) { + if ( $section == 'new' ) { # Inserting a new section - $subject = $summary ? wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n" : ''; + $subject = $summary ? wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" : ''; $text = strlen( trim( $oldtext ) ) > 0 ? "{$oldtext}\n\n{$subject}{$text}" : "{$subject}{$text}"; } else { # Replacing an existing section; roll out the big guns global $wgParser; + $text = $wgParser->replaceSection( $oldtext, $section, $text ); } } + wfProfileOut( __METHOD__ ); return $text; } @@ -1725,34 +1958,13 @@ class Article { * This function is not deprecated until somebody fixes the core not to use * it. Nevertheless, use Article::doEdit() instead. */ - function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false, $bot=false ) { + function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC = false, $comment = false, $bot = false ) { $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY | ( $isminor ? EDIT_MINOR : 0 ) | ( $suppressRC ? EDIT_SUPPRESS_RC : 0 ) | ( $bot ? EDIT_FORCE_BOT : 0 ); - # If this is a comment, add the summary as headline - if( $comment && $summary != "" ) { - $text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text; - } - - $this->doEdit( $text, $summary, $flags ); - - $dbw = wfGetDB( DB_MASTER ); - if($watchthis) { - if(!$this->mTitle->userIsWatching()) { - $dbw->begin(); - $this->doWatch(); - $dbw->commit(); - } - } else { - if( $this->mTitle->userIsWatching() ) { - $dbw->begin(); - $this->doUnwatch(); - $dbw->commit(); - } - } - $this->doRedirect( $this->isRedirect( $text ) ); + $this->doEdit( $text, $summary, $flags, false, null, $watchthis, $comment, '', true ); } /** @@ -1763,31 +1975,30 @@ class Article { ( $minor ? EDIT_MINOR : 0 ) | ( $forceBot ? EDIT_FORCE_BOT : 0 ); - $status = $this->doEdit( $text, $summary, $flags ); - if( !$status->isOK() ) { + $status = $this->doEdit( $text, $summary, $flags, false, null, $watchthis, false, $sectionanchor, true ); + + if ( !$status->isOK() ) { return false; } - $dbw = wfGetDB( DB_MASTER ); - if( $watchthis ) { - if(!$this->mTitle->userIsWatching()) { - $dbw->begin(); - $this->doWatch(); - $dbw->commit(); - } - } else { - if( $this->mTitle->userIsWatching() ) { - $dbw->begin(); - $this->doUnwatch(); - $dbw->commit(); + return true; + } + + /** + * Check flags and add EDIT_NEW or EDIT_UPDATE to them as needed. + * @param $flags Int + * @return Int updated $flags + */ + function checkFlags( $flags ) { + if ( !( $flags & EDIT_NEW ) && !( $flags & EDIT_UPDATE ) ) { + if ( $this->mTitle->getArticleID() ) { + $flags |= EDIT_UPDATE; + } else { + $flags |= EDIT_NEW; } } - $extraQuery = ''; // Give extensions a chance to modify URL query on update - wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraQuery ) ); - - $this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraQuery ); - return true; + return $flags; } /** @@ -1824,6 +2035,10 @@ class Article { * * @param $baseRevId the revision ID this edit was based off, if any * @param $user Optional user object, $wgUser will be used if not passed + * @param $watchthis Watch the page if true, unwatch the page if false, do nothing if null + * @param $sectionanchor The section anchor for the page; used for redirecting the user back to the page + * after the edit is successfully committed + * @param $redirect If true, redirect the user back to the page after the edit is successfully committed * * @return Status object. Possible errors: * edit-hook-aborted: The ArticleSave hook aborted the edit but didn't set the fatal flag of $status @@ -1840,51 +2055,52 @@ class Article { * * Compatibility note: this function previously returned a boolean value indicating success/failure */ - public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) { + public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null , $watchthis = null, + $comment = false, $sectionanchor = '', $redirect = false) { global $wgUser, $wgDBtransactions, $wgUseAutomaticEditSummaries; # Low-level sanity check - if( $this->mTitle->getText() == '' ) { + if ( $this->mTitle->getText() == '' ) { throw new MWException( 'Something is trying to edit an article with an empty title' ); } wfProfileIn( __METHOD__ ); - $user = is_null($user) ? $wgUser : $user; + $user = is_null( $user ) ? $wgUser : $user; $status = Status::newGood( array() ); # Load $this->mTitle->getArticleID() and $this->mLatest if it's not already $this->loadPageData(); - - if( !($flags & EDIT_NEW) && !($flags & EDIT_UPDATE) ) { - $aid = $this->mTitle->getArticleID(); - if( $aid ) { - $flags |= EDIT_UPDATE; - } else { - $flags |= EDIT_NEW; - } + + $flags = $this->checkFlags( $flags ); + + # If this is a comment, add the summary as headline + if ( $comment && $summary != "" ) { + $text = wfMsgForContent( 'newsectionheaderdefaultlevel', $summary ) . "\n\n" . $text; } - if( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary, - $flags & EDIT_MINOR, null, null, &$flags, &$status ) ) ) + if ( !wfRunHooks( 'ArticleSave', array( &$this, &$user, &$text, &$summary, + $flags & EDIT_MINOR, &$watchthis, null, &$flags, &$status) ) ) { wfDebug( __METHOD__ . ": ArticleSave hook aborted save!\n" ); wfProfileOut( __METHOD__ ); - if( $status->isOK() ) { - $status->fatal( 'edit-hook-aborted'); + + if ( $status->isOK() ) { + $status->fatal( 'edit-hook-aborted' ); } + return $status; } # Silently ignore EDIT_MINOR if not allowed - $isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed('minoredit'); + $isminor = ( $flags & EDIT_MINOR ) && $user->isAllowed( 'minoredit' ); $bot = $flags & EDIT_FORCE_BOT; $oldtext = $this->getRawText(); // current revision $oldsize = strlen( $oldtext ); # Provide autosummaries if one is not provided and autosummaries are enabled. - if( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) { + if ( $wgUseAutomaticEditSummaries && $flags & EDIT_AUTOSUMMARY && $summary == '' ) { $summary = $this->getAutosummary( $oldtext, $text, $flags ); } @@ -1894,13 +2110,14 @@ class Article { $dbw = wfGetDB( DB_MASTER ); $now = wfTimestampNow(); - $this->mTimestamp=$now; + $this->mTimestamp = $now; - if( $flags & EDIT_UPDATE ) { + if ( $flags & EDIT_UPDATE ) { # Update article, but only if changed. $status->value['new'] = false; + # Make sure the revision is either completely inserted or not inserted at all - if( !$wgDBtransactions ) { + if ( !$wgDBtransactions ) { $userAbort = ignore_user_abort( true ); } @@ -1908,15 +2125,16 @@ class Article { $changed = ( strcmp( $text, $oldtext ) != 0 ); - if( $changed ) { + if ( $changed ) { $this->mGoodAdjustment = (int)$this->isCountable( $text ) - (int)$this->isCountable( $oldtext ); $this->mTotalAdjustment = 0; - if( !$this->mLatest ) { + if ( !$this->mLatest ) { # Article gone missing - wfDebug( __METHOD__.": EDIT_UPDATE specified but article doesn't exist\n" ); + wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" ); $status->fatal( 'edit-gone-missing' ); + wfProfileOut( __METHOD__ ); return $status; } @@ -1929,7 +2147,7 @@ class Article { 'parent_id' => $this->mLatest, 'user' => $user->getId(), 'user_text' => $user->getName(), - ) ); + ) ); $dbw->begin(); $revisionId = $revision->insertOn( $dbw ); @@ -1943,29 +2161,32 @@ class Article { # creates a window where concurrent edits can cause an ignored edit conflict. $ok = $this->updateRevisionOn( $dbw, $revision, $this->mLatest ); - if( !$ok ) { + if ( !$ok ) { /* Belated edit conflict! Run away!! */ $status->fatal( 'edit-conflict' ); + # Delete the invalid revision if the DB is not transactional - if( !$wgDBtransactions ) { + if ( !$wgDBtransactions ) { $dbw->delete( 'revision', array( 'rev_id' => $revisionId ), __METHOD__ ); } + $revisionId = 0; $dbw->rollback(); } else { global $wgUseRCPatrol; - wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, $baseRevId, $user) ); + wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, $baseRevId, $user ) ); # Update recentchanges - if( !( $flags & EDIT_SUPPRESS_RC ) ) { + if ( !( $flags & EDIT_SUPPRESS_RC ) ) { # Mark as patrolled if the user can do so - $patrolled = $wgUseRCPatrol && $this->mTitle->userCan('autopatrol'); + $patrolled = $wgUseRCPatrol && $this->mTitle->userCan( 'autopatrol' ); # Add RC row to the DB $rc = RecentChange::notifyEdit( $now, $this->mTitle, $isminor, $user, $summary, $this->mLatest, $this->getTimestamp(), $bot, '', $oldsize, $newsize, $revisionId, $patrolled ); + # Log auto-patrolled edits - if( $patrolled ) { + if ( $patrolled ) { PatrolLog::record( $rc, true ); } } @@ -1982,11 +2203,12 @@ class Article { $this->mTitle->invalidateCache(); } - if( !$wgDBtransactions ) { + if ( !$wgDBtransactions ) { ignore_user_abort( $userAbort ); } + // Now that ignore_user_abort is restored, we can respond to fatal errors - if( !$status->isOK() ) { + if ( !$status->isOK() ) { wfProfileOut( __METHOD__ ); return $status; } @@ -2012,9 +2234,10 @@ class Article { # This will return false if the article already exists $newid = $this->insertOn( $dbw ); - if( $newid === false ) { + if ( $newid === false ) { $dbw->rollback(); $status->fatal( 'edit-already-exists' ); + wfProfileOut( __METHOD__ ); return $status; } @@ -2035,17 +2258,20 @@ class Article { # Update the page record with revision data $this->updateRevisionOn( $dbw, $revision, 0 ); - wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $user) ); + wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) ); + # Update recentchanges - if( !( $flags & EDIT_SUPPRESS_RC ) ) { + if ( !( $flags & EDIT_SUPPRESS_RC ) ) { global $wgUseRCPatrol, $wgUseNPPatrol; + # Mark as patrolled if the user can do so - $patrolled = ($wgUseRCPatrol || $wgUseNPPatrol) && $this->mTitle->userCan('autopatrol'); + $patrolled = ( $wgUseRCPatrol || $wgUseNPPatrol ) && $this->mTitle->userCan( 'autopatrol' ); # Add RC row to the DB $rc = RecentChange::notifyNew( $now, $this->mTitle, $isminor, $user, $summary, $bot, - '', strlen($text), $revisionId, $patrolled ); + '', strlen( $text ), $revisionId, $patrolled ); + # Log auto-patrolled edits - if( $patrolled ) { + if ( $patrolled ) { PatrolLog::record( $rc, true ); } } @@ -2059,11 +2285,11 @@ class Article { Article::onArticleCreate( $this->mTitle ); wfRunHooks( 'ArticleInsertComplete', array( &$this, &$user, $text, $summary, - $flags & EDIT_MINOR, null, null, &$flags, $revision ) ); + $flags & EDIT_MINOR, &$watchthis, null, &$flags, $revision ) ); } # Do updates right now unless deferral was requested - if( !( $flags & EDIT_DEFER_UPDATES ) ) { + if ( !( $flags & EDIT_DEFER_UPDATES ) ) { wfDoUpdates(); } @@ -2071,9 +2297,39 @@ class Article { $status->value['revision'] = $revision; wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary, - $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) ); + $flags & EDIT_MINOR, &$watchthis, null, &$flags, $revision, &$status, $baseRevId, + &$redirect) ); + + # Watch or unwatch the page + if ( $watchthis === true ) { + if ( !$this->mTitle->userIsWatching() ) { + $dbw->begin(); + $this->doWatch(); + $dbw->commit(); + } + } elseif ( $watchthis === false ) { + if ( $this->mTitle->userIsWatching() ) { + $dbw->begin(); + $this->doUnwatch(); + $dbw->commit(); + } + } + + # Give extensions a chance to modify URL query on update + $extraQuery = ''; + + wfRunHooks( 'ArticleUpdateBeforeRedirect', array( $this, &$sectionanchor, &$extraQuery ) ); + + if ( $redirect ) { + if ( $sectionanchor || $extraQuery ) { + $this->doRedirect( $this->isRedirect( $text ), $sectionanchor, $extraQuery ); + } else { + $this->doRedirect( $this->isRedirect( $text ) ); + } + } wfProfileOut( __METHOD__ ); + return $status; } @@ -2095,13 +2351,15 @@ class Article { */ public function doRedirect( $noRedir = false, $sectionAnchor = '', $extraQuery = '' ) { global $wgOut; - if( $noRedir ) { + + if ( $noRedir ) { $query = 'redirect=no'; - if( $extraQuery ) + if ( $extraQuery ) $query .= "&$query"; } else { $query = $extraQuery; } + $wgOut->redirect( $this->mTitle->getFullURL( $query ) . $sectionAnchor ); } @@ -2110,70 +2368,78 @@ class Article { */ public function markpatrolled() { global $wgOut, $wgRequest, $wgUseRCPatrol, $wgUseNPPatrol, $wgUser; + $wgOut->setRobotPolicy( 'noindex,nofollow' ); # If we haven't been given an rc_id value, we can't do anything - $rcid = (int) $wgRequest->getVal('rcid'); - $rc = RecentChange::newFromId($rcid); - if( is_null($rc) ) { + $rcid = (int) $wgRequest->getVal( 'rcid' ); + $rc = RecentChange::newFromId( $rcid ); + + if ( is_null( $rc ) ) { $wgOut->showErrorPage( 'markedaspatrollederror', 'markedaspatrollederrortext' ); return; } - #It would be nice to see where the user had actually come from, but for now just guess + # It would be nice to see where the user had actually come from, but for now just guess $returnto = $rc->getAttribute( 'rc_type' ) == RC_NEW ? 'Newpages' : 'Recentchanges'; $return = SpecialPage::getTitleFor( $returnto ); $dbw = wfGetDB( DB_MASTER ); $errors = $rc->doMarkPatrolled(); - if( in_array(array('rcpatroldisabled'), $errors) ) { + if ( in_array( array( 'rcpatroldisabled' ), $errors ) ) { $wgOut->showErrorPage( 'rcpatroldisabled', 'rcpatroldisabledtext' ); + return; } - if( in_array(array('hookaborted'), $errors) ) { + if ( in_array( array( 'hookaborted' ), $errors ) ) { // The hook itself has handled any output return; } - if( in_array(array('markedaspatrollederror-noautopatrol'), $errors) ) { + if ( in_array( array( 'markedaspatrollederror-noautopatrol' ), $errors ) ) { $wgOut->setPageTitle( wfMsg( 'markedaspatrollederror' ) ); $wgOut->addWikiMsg( 'markedaspatrollederror-noautopatrol' ); $wgOut->returnToMain( false, $return ); + return; } - if( !empty($errors) ) { + if ( !empty( $errors ) ) { $wgOut->showPermissionsErrorPage( $errors ); + return; } # Inform the user $wgOut->setPageTitle( wfMsg( 'markedaspatrolled' ) ); - $wgOut->addWikiMsg( 'markedaspatrolledtext' ); + $wgOut->addWikiMsg( 'markedaspatrolledtext', $rc->getTitle()->getPrefixedText() ); $wgOut->returnToMain( false, $return ); } /** * User-interface handler for the "watch" action */ - public function watch() { global $wgUser, $wgOut; - if( $wgUser->isAnon() ) { + + if ( $wgUser->isAnon() ) { $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' ); return; } - if( wfReadOnly() ) { + + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } - if( $this->doWatch() ) { + + if ( $this->doWatch() ) { $wgOut->setPagetitle( wfMsg( 'addedwatch' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'addedwatchtext', $this->mTitle->getPrefixedText() ); } + $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() ); } @@ -2183,13 +2449,16 @@ class Article { */ public function doWatch() { global $wgUser; - if( $wgUser->isAnon() ) { + + if ( $wgUser->isAnon() ) { return false; } - if( wfRunHooks('WatchArticle', array(&$wgUser, &$this)) ) { + + if ( wfRunHooks( 'WatchArticle', array( &$wgUser, &$this ) ) ) { $wgUser->addWatch( $this->mTitle ); - return wfRunHooks('WatchArticleComplete', array(&$wgUser, &$this)); + return wfRunHooks( 'WatchArticleComplete', array( &$wgUser, &$this ) ); } + return false; } @@ -2198,19 +2467,23 @@ class Article { */ public function unwatch() { global $wgUser, $wgOut; - if( $wgUser->isAnon() ) { + + if ( $wgUser->isAnon() ) { $wgOut->showErrorPage( 'watchnologin', 'watchnologintext' ); return; } - if( wfReadOnly() ) { + + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } - if( $this->doUnwatch() ) { + + if ( $this->doUnwatch() ) { $wgOut->setPagetitle( wfMsg( 'removedwatch' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'removedwatchtext', $this->mTitle->getPrefixedText() ); } + $wgOut->returnToMain( true, $this->mTitle->getPrefixedText() ); } @@ -2220,13 +2493,16 @@ class Article { */ public function doUnwatch() { global $wgUser; - if( $wgUser->isAnon() ) { + + if ( $wgUser->isAnon() ) { return false; } - if( wfRunHooks('UnwatchArticle', array(&$wgUser, &$this)) ) { + + if ( wfRunHooks( 'UnwatchArticle', array( &$wgUser, &$this ) ) ) { $wgUser->removeWatch( $this->mTitle ); - return wfRunHooks('UnwatchArticleComplete', array(&$wgUser, &$this)); + return wfRunHooks( 'UnwatchArticleComplete', array( &$wgUser, &$this ) ); } + return false; } @@ -2255,9 +2531,12 @@ class Article { * @return bool true on success */ public function updateRestrictions( $limit = array(), $reason = '', &$cascade = 0, $expiry = array() ) { - global $wgUser, $wgRestrictionTypes, $wgContLang; + global $wgUser, $wgContLang; + + $restrictionTypes = $this->mTitle->getRestrictionTypes(); $id = $this->mTitle->getArticleID(); + if ( $id <= 0 ) { wfDebug( "updateRestrictions failed: $id <= 0\n" ); return false; @@ -2273,7 +2552,7 @@ class Article { return false; } - if( !$cascade ) { + if ( !$cascade ) { $cascade = false; } @@ -2285,17 +2564,19 @@ class Article { $current = array(); $updated = Article::flattenRestrictions( $limit ); $changed = false; - foreach( $wgRestrictionTypes as $action ) { - if( isset( $expiry[$action] ) ) { + + foreach ( $restrictionTypes as $action ) { + if ( isset( $expiry[$action] ) ) { # Get current restrictions on $action $aLimits = $this->mTitle->getRestrictions( $action ); $current[$action] = implode( '', $aLimits ); # Are any actual restrictions being dealt with here? - $aRChanged = count($aLimits) || !empty($limit[$action]); + $aRChanged = count( $aLimits ) || !empty( $limit[$action] ); + # If something changed, we need to log it. Checking $aRChanged # assures that "unprotecting" a page that is not protected does # not log just because the expiry was "changed". - if( $aRChanged && $this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action] ) { + if ( $aRChanged && $this->mTitle->mRestrictionsExpiry[$action] != $expiry[$action] ) { $changed = true; } } @@ -2303,50 +2584,56 @@ class Article { $current = Article::flattenRestrictions( $current ); - $changed = ($changed || $current != $updated ); - $changed = $changed || ($updated && $this->mTitle->areRestrictionsCascading() != $cascade); + $changed = ( $changed || $current != $updated ); + $changed = $changed || ( $updated && $this->mTitle->areRestrictionsCascading() != $cascade ); $protect = ( $updated != '' ); # If nothing's changed, do nothing - if( $changed ) { - if( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) { - + if ( $changed ) { + if ( wfRunHooks( 'ArticleProtect', array( &$this, &$wgUser, $limit, $reason ) ) ) { $dbw = wfGetDB( DB_MASTER ); # Prepare a null revision to be added to the history $modified = $current != '' && $protect; - if( $protect ) { + + if ( $protect ) { $comment_type = $modified ? 'modifiedarticleprotection' : 'protectedarticle'; } else { $comment_type = 'unprotectedarticle'; } + $comment = $wgContLang->ucfirst( wfMsgForContent( $comment_type, $this->mTitle->getPrefixedText() ) ); # Only restrictions with the 'protect' right can cascade... # Otherwise, people who cannot normally protect can "protect" pages via transclusion $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' ); + # The schema allows multiple restrictions - if(!in_array('protect', $editrestriction) && !in_array('sysop', $editrestriction)) + if ( !in_array( 'protect', $editrestriction ) && !in_array( 'sysop', $editrestriction ) ) { $cascade = false; + } + $cascade_description = ''; - if( $cascade ) { - $cascade_description = ' ['.wfMsgForContent('protect-summary-cascade').']'; + + if ( $cascade ) { + $cascade_description = ' [' . wfMsgForContent( 'protect-summary-cascade' ) . ']'; } - if( $reason ) + if ( $reason ) { $comment .= ": $reason"; + } $editComment = $comment; $encodedExpiry = array(); $protect_description = ''; - foreach( $limit as $action => $restrictions ) { - if ( !isset($expiry[$action]) ) + foreach ( $limit as $action => $restrictions ) { + if ( !isset( $expiry[$action] ) ) $expiry[$action] = 'infinite'; - $encodedExpiry[$action] = Block::encodeExpiry($expiry[$action], $dbw ); - if( $restrictions != '' ) { + $encodedExpiry[$action] = Block::encodeExpiry( $expiry[$action], $dbw ); + if ( $restrictions != '' ) { $protect_description .= "[$action=$restrictions] ("; - if( $encodedExpiry[$action] != 'infinity' ) { + if ( $encodedExpiry[$action] != 'infinity' ) { $protect_description .= wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry[$action], false, false ) , $wgContLang->date( $expiry[$action], false, false ) , @@ -2354,24 +2641,32 @@ class Article { } else { $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' ); } + $protect_description .= ') '; } } - $protect_description = trim($protect_description); + $protect_description = trim( $protect_description ); - if( $protect_description && $protect ) + if ( $protect_description && $protect ) { $editComment .= " ($protect_description)"; - if( $cascade ) + } + + if ( $cascade ) { $editComment .= "$cascade_description"; + } + # Update restrictions table - foreach( $limit as $action => $restrictions ) { - if($restrictions != '' ) { - $dbw->replace( 'page_restrictions', array(array('pr_page', 'pr_type')), + foreach ( $limit as $action => $restrictions ) { + if ( $restrictions != '' ) { + $dbw->replace( 'page_restrictions', array( array( 'pr_page', 'pr_type' ) ), array( 'pr_page' => $id, 'pr_type' => $action, 'pr_level' => $restrictions, - 'pr_cascade' => ($cascade && $action == 'edit') ? 1 : 0, - 'pr_expiry' => $encodedExpiry[$action] ), __METHOD__ ); + 'pr_cascade' => ( $cascade && $action == 'edit' ) ? 1 : 0, + 'pr_expiry' => $encodedExpiry[$action] + ), + __METHOD__ + ); } else { $dbw->delete( 'page_restrictions', array( 'pr_page' => $id, 'pr_type' => $action ), __METHOD__ ); @@ -2394,18 +2689,17 @@ class Article { ), 'Article::protect' ); - wfRunHooks( 'NewRevisionFromEditComplete', array($this, $nullRevision, $latest, $wgUser) ); + wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $nullRevision, $latest, $wgUser ) ); wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) ); # Update the protection log $log = new LogPage( 'protect' ); - if( $protect ) { - $params = array($protect_description,$cascade ? 'cascade' : ''); - $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason), $params ); + if ( $protect ) { + $params = array( $protect_description, $cascade ? 'cascade' : '' ); + $log->addEntry( $modified ? 'modify' : 'protect', $this->mTitle, trim( $reason ), $params ); } else { $log->addEntry( 'unprotect', $this->mTitle, $reason ); } - } # End hook } # End "changed" check @@ -2419,39 +2713,50 @@ class Article { * @return String */ protected static function flattenRestrictions( $limit ) { - if( !is_array( $limit ) ) { + if ( !is_array( $limit ) ) { throw new MWException( 'Article::flattenRestrictions given non-array restriction set' ); } + $bits = array(); ksort( $limit ); - foreach( $limit as $action => $restrictions ) { - if( $restrictions != '' ) { + + foreach ( $limit as $action => $restrictions ) { + if ( $restrictions != '' ) { $bits[] = "$action=$restrictions"; } } + return implode( ':', $bits ); } /** * Auto-generates a deletion reason + * * @param &$hasHistory Boolean: whether the page has a history + * @return mixed String containing deletion reason or empty string, or boolean false + * if no revision occurred */ public function generateReason( &$hasHistory ) { global $wgContLang; + $dbw = wfGetDB( DB_MASTER ); // Get the last revision $rev = Revision::newFromTitle( $this->mTitle ); - if( is_null( $rev ) ) + + if ( is_null( $rev ) ) { return false; + } // Get the article's contents $contents = $rev->getText(); $blank = false; + // If the page is blank, use the text from the previous revision, // which can only be blank if there's a move/import/protect dummy revision involved - if( $contents == '' ) { + if ( $contents == '' ) { $prev = $rev->getPrevious(); - if( $prev ) { + + if ( $prev ) { $contents = $prev->getText(); $blank = true; } @@ -2460,39 +2765,48 @@ class Article { // Find out if there was only one contributor // Only scan the last 20 revisions $res = $dbw->select( 'revision', 'rev_user_text', - array( 'rev_page' => $this->getID(), $dbw->bitAnd('rev_deleted', Revision::DELETED_USER) . ' = 0' ), + array( 'rev_page' => $this->getID(), $dbw->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0' ), __METHOD__, array( 'LIMIT' => 20 ) ); - if( $res === false ) + + if ( $res === false ) { // This page has no revisions, which is very weird return false; + } $hasHistory = ( $res->numRows() > 1 ); $row = $dbw->fetchObject( $res ); - $onlyAuthor = $row->rev_user_text; - // Try to find a second contributor - foreach( $res as $row ) { - if( $row->rev_user_text != $onlyAuthor ) { - $onlyAuthor = false; - break; + + if ( $row ) { // $row is false if the only contributor is hidden + $onlyAuthor = $row->rev_user_text; + // Try to find a second contributor + foreach ( $res as $row ) { + if ( $row->rev_user_text != $onlyAuthor ) { // Bug 22999 + $onlyAuthor = false; + break; + } } + } else { + $onlyAuthor = false; } + $dbw->freeResult( $res ); // Generate the summary with a '$1' placeholder - if( $blank ) { + if ( $blank ) { // The current revision is blank and the one before is also // blank. It's just not our lucky day $reason = wfMsgForContent( 'exbeforeblank', '$1' ); } else { - if( $onlyAuthor ) + if ( $onlyAuthor ) { $reason = wfMsgForContent( 'excontentauthor', '$1', $onlyAuthor ); - else + } else { $reason = wfMsgForContent( 'excontent', '$1' ); + } } - if( $reason == '-' ) { + if ( $reason == '-' ) { // Allow these UI messages to be blanked out cleanly return ''; } @@ -2501,12 +2815,13 @@ class Article { $contents = preg_replace( "/[\n\r]/", ' ', $contents ); // Calculate the maximum amount of chars to get // Max content length = max comment length - length of the comment (excl. $1) - '...' - $maxLength = 255 - (strlen( $reason ) - 2) - 3; + $maxLength = 255 - ( strlen( $reason ) - 2 ) - 3; $contents = $wgContLang->truncate( $contents, $maxLength ); // Remove possible unfinished links $contents = preg_replace( '/\[\[([^\]]*)\]?$/', '$1', $contents ); // Now replace the '$1' placeholder $reason = str_replace( '$1', $contents, $reason ); + return $reason; } @@ -2525,28 +2840,31 @@ class Article { $reason = $this->DeleteReasonList; - if( $reason != 'other' && $this->DeleteReason != '' ) { + if ( $reason != 'other' && $this->DeleteReason != '' ) { // Entry from drop down menu + additional comment $reason .= wfMsgForContent( 'colon-separator' ) . $this->DeleteReason; - } elseif( $reason == 'other' ) { + } elseif ( $reason == 'other' ) { $reason = $this->DeleteReason; } + # Flag to hide all contents of the archived revisions $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed( 'suppressrevision' ); # This code desperately needs to be totally rewritten # Read-only check... - if( wfReadOnly() ) { + if ( wfReadOnly() ) { $wgOut->readOnlyPage(); + return; } # Check permissions $permission_errors = $this->mTitle->getUserPermissionsErrors( 'delete', $wgUser ); - if( count( $permission_errors ) > 0 ) { + if ( count( $permission_errors ) > 0 ) { $wgOut->showPermissionsErrorPage( $permission_errors ); + return; } @@ -2556,7 +2874,7 @@ class Article { $dbw = wfGetDB( DB_MASTER ); $conds = $this->mTitle->pageCond(); $latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ ); - if( $latest === false ) { + if ( $latest === false ) { $wgOut->showFatalError( Html::rawElement( 'div', @@ -2570,45 +2888,55 @@ class Article { 'delete', $this->mTitle->getPrefixedText() ); + return; } # Hack for big sites $bigHistory = $this->isBigDeletion(); - if( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) { + if ( $bigHistory && !$this->mTitle->userCan( 'bigdelete' ) ) { global $wgLang, $wgDeleteRevisionsLimit; - $wgOut->wrapWikiMsg( "\n$1\n", + + $wgOut->wrapWikiMsg( "\n$1\n\n", array( 'delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) ); + return; } - if( $confirm ) { + if ( $confirm ) { $this->doDelete( $reason, $suppress ); - if( $wgRequest->getCheck( 'wpWatch' ) ) { + + if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) { $this->doWatch(); - } elseif( $this->mTitle->userIsWatching() ) { + } elseif ( $this->mTitle->userIsWatching() ) { $this->doUnwatch(); } + return; } // Generate deletion reason $hasHistory = false; - if( !$reason ) $reason = $this->generateReason($hasHistory); + if ( !$reason ) { + $reason = $this->generateReason( $hasHistory ); + } // If the page has a history, insert a warning - if( $hasHistory && !$confirm ) { + if ( $hasHistory && !$confirm ) { global $wgLang; + $skin = $wgUser->getSkin(); $revisions = $this->estimateRevisionCount(); $wgOut->addHTML( '' . - wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) .' ' . - $skin->historyLink() . + wfMsgExt( 'historywarning', array( 'parseinline' ), $wgLang->formatNum( $revisions ) ) . + wfMsgHtml( 'word-separator' ) . $skin->historyLink() . '' ); - if( $bigHistory ) { + + if ( $bigHistory ) { global $wgDeleteRevisionsLimit; - $wgOut->wrapWikiMsg( "\n$1\n", + + $wgOut->wrapWikiMsg( "\n$1\n\n", array( 'delete-warning-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) ); } } @@ -2621,10 +2949,13 @@ class Article { */ public function isBigDeletion() { global $wgDeleteRevisionsLimit; - if( $wgDeleteRevisionsLimit ) { + + if ( $wgDeleteRevisionsLimit ) { $revCount = $this->estimateRevisionCount(); + return $revCount > $wgDeleteRevisionsLimit; } + return false; } @@ -2633,11 +2964,12 @@ class Article { */ public function estimateRevisionCount() { $dbr = wfGetDB( DB_SLAVE ); + // For an exact count... - //return $dbr->selectField( 'revision', 'COUNT(*)', + // return $dbr->selectField( 'revision', 'COUNT(*)', // array( 'rev_page' => $this->getId() ), __METHOD__ ); return $dbr->estimateRowCount( 'revision', '*', - array( 'rev_page' => $this->getId() ), __METHOD__ ); + array( 'rev_page' => $this->getId() ), __METHOD__ ); } /** @@ -2652,6 +2984,7 @@ class Article { // If that doesn't have the latest revision, try the master $continue = 2; $db = wfGetDB( DB_SLAVE ); + do { $res = $db->select( array( 'page', 'revision' ), array( 'rev_id', 'rev_user_text' ), @@ -2664,12 +2997,15 @@ class Article { 'LIMIT' => $num ) ) ); - if( !$res ) { + + if ( !$res ) { wfProfileOut( __METHOD__ ); return array(); } + $row = $db->fetchObject( $res ); - if( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) { + + if ( $continue == 2 && $revLatest && $row->rev_id != $revLatest ) { $db = wfGetDB( DB_MASTER ); $continue--; } else { @@ -2678,9 +3014,11 @@ class Article { } while ( $continue ); $authors = array( $row->rev_user_text ); + while ( $row = $db->fetchObject( $res ) ) { $authors[] = $row->rev_user_text; } + wfProfileOut( __METHOD__ ); return $authors; } @@ -2704,10 +3042,10 @@ class Article { $wgOut->setSubtitle( wfMsgHtml( 'delete-backlink', $deleteBackLink ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->addWikiMsg( 'confirmdeletetext' ); - + wfRunHooks( 'ArticleConfirmDelete', array( $this, $wgOut, &$reason ) ); - if( $wgUser->isAllowed( 'suppressrevision' ) ) { + if ( $wgUser->isAllowed( 'suppressrevision' ) ) { $suppress = "+ "; + + # Disallow watching if user is not logged in + if ( $wgUser->isLoggedIn() ) { + $form .= " " . @@ -2748,14 +3086,21 @@ class Article { 'autofocus' ) ) . " -+ "; + } + + $form .= " $suppress " . Xml::checkLabel( wfMsg( 'watchthis' ), 'wpWatch', 'wpWatch', $checkWatch, array( 'tabindex' => '3' ) ) . " -@@ -2769,7 +3114,7 @@ class Article { Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . Xml::closeElement( 'form' ); - if( $wgUser->isAllowed( 'editinterface' ) ) { + if ( $wgUser->isAllowed( 'editinterface' ) ) { $skin = $wgUser->getSkin(); $title = Title::makeTitle( NS_MEDIAWIKI, 'Deletereason-dropdown' ); $link = $skin->link( @@ -2795,11 +3140,12 @@ class Article { */ public function doDelete( $reason, $suppress = false ) { global $wgOut, $wgUser; + $id = $this->mTitle->getArticleID( GAID_FOR_UPDATE ); $error = ''; - if( wfRunHooks('ArticleDelete', array(&$this, &$wgUser, &$reason, &$error)) ) { - if( $this->doDeleteArticle( $reason, $suppress, $id ) ) { + if ( wfRunHooks( 'ArticleDelete', array( &$this, &$wgUser, &$reason, &$error ) ) ) { + if ( $this->doDeleteArticle( $reason, $suppress, $id ) ) { $deleted = $this->mTitle->getPrefixedText(); $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); @@ -2809,10 +3155,10 @@ class Article { $wgOut->addWikiMsg( 'deletedtext', $deleted, $loglink ); $wgOut->returnToMain( false ); - wfRunHooks('ArticleDeleteComplete', array(&$this, &$wgUser, $reason, $id)); + wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$wgUser, $reason, $id ) ); } } else { - if( $error == '' ) { + if ( $error == '' ) { $wgOut->showFatalError( Html::rawElement( 'div', @@ -2820,7 +3166,9 @@ class Article { wfMsgExt( 'cannotdelete', array( 'parse' ), $this->mTitle->getPrefixedText() ) ) ); + $wgOut->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) ); + LogEventsList::showLogExtract( $wgOut, 'delete', @@ -2835,28 +3183,37 @@ class Article { /** * Back-end article deletion * Deletes the article with database consistency, writes logs, purges caches - * Returns success + * + * @param $reason string delete reason for deletion log + * @param suppress bitfield + * Revision::DELETED_TEXT + * Revision::DELETED_COMMENT + * Revision::DELETED_USER + * Revision::DELETED_RESTRICTED + * @param $id int article ID + * @param $commit boolean defaults to true, triggers transaction end + * @return boolean true if successful */ - public function doDeleteArticle( $reason, $suppress = false, $id = 0 ) { + public function doDeleteArticle( $reason, $suppress = false, $id = 0, $commit = true ) { global $wgUseSquid, $wgDeferredUpdateList; global $wgUseTrackbacks; - wfDebug( __METHOD__."\n" ); + wfDebug( __METHOD__ . "\n" ); $dbw = wfGetDB( DB_MASTER ); $ns = $this->mTitle->getNamespace(); $t = $this->mTitle->getDBkey(); $id = $id ? $id : $this->mTitle->getArticleID( GAID_FOR_UPDATE ); - if( $t == '' || $id == 0 ) { + if ( $t == '' || $id == 0 ) { return false; } - $u = new SiteStatsUpdate( 0, 1, -(int)$this->isCountable( $this->getRawText() ), -1 ); + $u = new SiteStatsUpdate( 0, 1, - (int)$this->isCountable( $this->getRawText() ), -1 ); array_push( $wgDeferredUpdateList, $u ); // Bitfields to further suppress the content - if( $suppress ) { + if ( $suppress ) { $bitfield = 0; // This should be 15... $bitfield |= Revision::DELETED_TEXT; @@ -2904,9 +3261,10 @@ class Article { $dbw->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ ); # Now that it's safely backed up, delete it - $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__); + $dbw->delete( 'page', array( 'page_id' => $id ), __METHOD__ ); $ok = ( $dbw->affectedRows() > 0 ); // getArticleId() uses slave, could be laggy - if( !$ok ) { + + if ( !$ok ) { $dbw->rollback(); return false; } @@ -2914,16 +3272,18 @@ class Article { # Fix category table counts $cats = array(); $res = $dbw->select( 'categorylinks', 'cl_to', array( 'cl_from' => $id ), __METHOD__ ); - foreach( $res as $row ) { - $cats []= $row->cl_to; + + foreach ( $res as $row ) { + $cats [] = $row->cl_to; } + $this->updateCategoryCounts( array(), $cats ); # If using cascading deletes, we can skip some explicit deletes - if( !$dbw->cascadingDeletes() ) { + if ( !$dbw->cascadingDeletes() ) { $dbw->delete( 'revision', array( 'rev_page' => $id ), __METHOD__ ); - if($wgUseTrackbacks) + if ( $wgUseTrackbacks ) $dbw->delete( 'trackbacks', array( 'tb_page' => $id ), __METHOD__ ); # Delete outgoing links @@ -2937,15 +3297,15 @@ class Article { } # If using cleanup triggers, we can skip some manual deletes - if( !$dbw->cleanupTriggers() ) { + if ( !$dbw->cleanupTriggers() ) { # Clean up recentchanges entries... $dbw->delete( 'recentchanges', - array( 'rc_type != '.RC_LOG, + array( 'rc_type != ' . RC_LOG, 'rc_namespace' => $this->mTitle->getNamespace(), 'rc_title' => $this->mTitle->getDBkey() ), __METHOD__ ); $dbw->delete( 'recentchanges', - array( 'rc_type != '.RC_LOG, 'rc_cur_id' => $id ), + array( 'rc_type != ' . RC_LOG, 'rc_cur_id' => $id ), __METHOD__ ); } @@ -2962,7 +3322,9 @@ class Article { # Make sure logging got through $log->addEntry( 'delete', $this->mTitle, $reason, array() ); - $dbw->commit(); + if ( $commit ) { + $dbw->commit(); + } return true; } @@ -2990,6 +3352,7 @@ class Article { */ public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails ) { global $wgUser; + $resultDetails = null; # Check permissions @@ -2997,17 +3360,20 @@ class Article { $rollbackErrors = $this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ); $errors = array_merge( $editErrors, wfArrayDiff2( $rollbackErrors, $editErrors ) ); - if( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) + if ( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) ) { $errors[] = array( 'sessionfailure' ); + } - if( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) { + if ( $wgUser->pingLimiter( 'rollback' ) || $wgUser->pingLimiter() ) { $errors[] = array( 'actionthrottledtext' ); } + # If there were errors, bail out now - if( !empty( $errors ) ) + if ( !empty( $errors ) ) { return $errors; + } - return $this->commitRollback($fromP, $summary, $bot, $resultDetails); + return $this->commitRollback( $fromP, $summary, $bot, $resultDetails ); } /** @@ -3019,31 +3385,32 @@ class Article { * ly if you want to use custom permissions checks. If you don't, use * doRollback() instead. */ - public function commitRollback($fromP, $summary, $bot, &$resultDetails) { + public function commitRollback( $fromP, $summary, $bot, &$resultDetails ) { global $wgUseRCPatrol, $wgUser, $wgLang; + $dbw = wfGetDB( DB_MASTER ); - if( wfReadOnly() ) { + if ( wfReadOnly() ) { return array( array( 'readonlytext' ) ); } # Get the last editor $current = Revision::newFromTitle( $this->mTitle ); - if( is_null( $current ) ) { + if ( is_null( $current ) ) { # Something wrong... no page? - return array(array('notanarticle')); + return array( array( 'notanarticle' ) ); } $from = str_replace( '_', ' ', $fromP ); # User name given should match up with the top revision. # If the user was deleted then $from should be empty. - if( $from != $current->getUserText() ) { + if ( $from != $current->getUserText() ) { $resultDetails = array( 'current' => $current ); - return array(array('alreadyrolled', - htmlspecialchars($this->mTitle->getPrefixedText()), - htmlspecialchars($fromP), - htmlspecialchars($current->getUserText()) - )); + return array( array( 'alreadyrolled', + htmlspecialchars( $this->mTitle->getPrefixedText() ), + htmlspecialchars( $fromP ), + htmlspecialchars( $current->getUserText() ) + ) ); } # Get the last edit not by this guy... @@ -3052,31 +3419,32 @@ class Article { $user_text = $dbw->addQuotes( $current->getRawUserText() ); $s = $dbw->selectRow( 'revision', array( 'rev_id', 'rev_timestamp', 'rev_deleted' ), - array( 'rev_page' => $current->getPage(), + array( 'rev_page' => $current->getPage(), "rev_user != {$user} OR rev_user_text != {$user_text}" ), __METHOD__, - array( 'USE INDEX' => 'page_timestamp', - 'ORDER BY' => 'rev_timestamp DESC' ) + array( 'USE INDEX' => 'page_timestamp', + 'ORDER BY' => 'rev_timestamp DESC' ) ); - if( $s === false ) { + if ( $s === false ) { # No one else ever edited this page - return array(array('cantrollback')); - } else if( $s->rev_deleted & REVISION::DELETED_TEXT || $s->rev_deleted & REVISION::DELETED_USER ) { + return array( array( 'cantrollback' ) ); + } else if ( $s->rev_deleted & REVISION::DELETED_TEXT || $s->rev_deleted & REVISION::DELETED_USER ) { # Only admins can see this text - return array(array('notvisiblerev')); + return array( array( 'notvisiblerev' ) ); } $set = array(); - if( $bot && $wgUser->isAllowed('markbotedits') ) { + if ( $bot && $wgUser->isAllowed( 'markbotedits' ) ) { # Mark all reverted edits as bot $set['rc_bot'] = 1; } - if( $wgUseRCPatrol ) { + + if ( $wgUseRCPatrol ) { # Mark all reverted edits as patrolled $set['rc_patrolled'] = 1; } - if( count($set) ) { + if ( count( $set ) ) { $dbw->update( 'recentchanges', $set, array( /* WHERE */ 'rc_cur_id' => $current->getPage(), @@ -3088,8 +3456,8 @@ class Article { # Generate the edit summary if necessary $target = Revision::newFromId( $s->rev_id ); - if( empty( $summary ) ) { - if( $from == '' ) { // no public user name + if ( empty( $summary ) ) { + if ( $from == '' ) { // no public user name $summary = wfMsgForContent( 'revertpage-nouser' ); } else { $summary = wfMsgForContent( 'revertpage' ); @@ -3099,22 +3467,25 @@ class Article { # Allow the custom summary to use the same args as the default message $args = array( $target->getUserText(), $from, $s->rev_id, - $wgLang->timeanddate(wfTimestamp(TS_MW, $s->rev_timestamp), true), - $current->getId(), $wgLang->timeanddate($current->getTimestamp()) + $wgLang->timeanddate( wfTimestamp( TS_MW, $s->rev_timestamp ), true ), + $current->getId(), $wgLang->timeanddate( $current->getTimestamp() ) ); $summary = wfMsgReplaceArgs( $summary, $args ); # Save $flags = EDIT_UPDATE; - if( $wgUser->isAllowed('minoredit') ) + if ( $wgUser->isAllowed( 'minoredit' ) ) { $flags |= EDIT_MINOR; + } - if( $bot && ($wgUser->isAllowed('markbotedits') || $wgUser->isAllowed('bot')) ) + if ( $bot && ( $wgUser->isAllowed( 'markbotedits' ) || $wgUser->isAllowed( 'bot' ) ) ) { $flags |= EDIT_FORCE_BOT; + } + # Actually store the edit $status = $this->doEdit( $target->getText(), $summary, $flags, $target->getId() ); - if( !empty( $status->value['revision'] ) ) { + if ( !empty( $status->value['revision'] ) ) { $revId = $status->value['revision']->getId(); } else { $revId = false; @@ -3128,6 +3499,7 @@ class Article { 'target' => $target, 'newid' => $revId ); + return array(); } @@ -3136,6 +3508,7 @@ class Article { */ public function rollback() { global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol; + $details = null; $result = $this->doRollback( @@ -3146,41 +3519,49 @@ class Article { $details ); - if( in_array( array( 'actionthrottledtext' ), $result ) ) { + if ( in_array( array( 'actionthrottledtext' ), $result ) ) { $wgOut->rateLimited(); return; } - if( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) { + + if ( isset( $result[0][0] ) && ( $result[0][0] == 'alreadyrolled' || $result[0][0] == 'cantrollback' ) ) { $wgOut->setPageTitle( wfMsg( 'rollbackfailed' ) ); $errArray = $result[0]; $errMsg = array_shift( $errArray ); $wgOut->addWikiMsgArray( $errMsg, $errArray ); - if( isset( $details['current'] ) ){ + + if ( isset( $details['current'] ) ) { $current = $details['current']; - if( $current->getComment() != '' ) { + + if ( $current->getComment() != '' ) { $wgOut->addWikiMsgArray( 'editcomment', array( $wgUser->getSkin()->formatComment( $current->getComment() ) ), array( 'replaceafter' ) ); } } + return; } + # Display permissions errors before read-only message -- there's no # point in misleading the user into thinking the inability to rollback # is only temporary. - if( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) { - # array_diff is completely broken for arrays of arrays, sigh. Re- - # move any 'readonlytext' error manually. + if ( !empty( $result ) && $result !== array( array( 'readonlytext' ) ) ) { + # array_diff is completely broken for arrays of arrays, sigh. + # Remove any 'readonlytext' error manually. $out = array(); - foreach( $result as $error ) { - if( $error != array( 'readonlytext' ) ) { - $out []= $error; + foreach ( $result as $error ) { + if ( $error != array( 'readonlytext' ) ) { + $out [] = $error; } } $wgOut->showPermissionsErrorPage( $out ); + return; } - if( $result == array( array( 'readonlytext' ) ) ) { + + if ( $result == array( array( 'readonlytext' ) ) ) { $wgOut->readOnlyPage(); + return; } @@ -3189,20 +3570,25 @@ class Article { $newId = $details['newid']; $wgOut->setPageTitle( wfMsg( 'actioncomplete' ) ); $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() ) - . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() ); + + if ( $current->getUserText() === '' ) { + $old = wfMsg( 'rev-deleted-user' ); + } else { + $old = $wgUser->getSkin()->userLink( $current->getUser(), $current->getUserText() ) + . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() ); + } + $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() ) . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() ); $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) ); $wgOut->returnToMain( false, $this->mTitle ); - if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) { + if ( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) { $de = new DifferenceEngine( $this->mTitle, $current->getId(), $newId, false, true ); $de->showDiff( '', '' ); } } - /** * Do standard deferred updates after page view */ @@ -3211,12 +3597,14 @@ class Article { if ( wfReadOnly() ) { return; } + # Don't update page view counters on views from bot users (bug 14044) - if( !$wgDisableCounters && !$wgUser->isAllowed('bot') && $this->getID() ) { + if ( !$wgDisableCounters && !$wgUser->isAllowed( 'bot' ) && $this->getID() ) { Article::incViewCount( $this->getID() ); $u = new SiteStatsUpdate( 1, 0, 0 ); array_push( $wgDeferredUpdateList, $u ); } + # Update newtalk / watchlist notification status $wgUser->clearNotification( $this->mTitle ); } @@ -3225,12 +3613,14 @@ class Article { * Prepare text which is about to be saved. * Returns a stdclass with source, pst and output members */ - public function prepareTextForEdit( $text, $revid=null ) { - if( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid) { + public function prepareTextForEdit( $text, $revid = null ) { + if ( $this->mPreparedEdit && $this->mPreparedEdit->newText == $text && $this->mPreparedEdit->revid == $revid ) { // Already prepared return $this->mPreparedEdit; } + global $wgParser; + $edit = (object)array(); $edit->revid = $revid; $edit->newText = $text; @@ -3238,7 +3628,9 @@ class Article { $options = $this->getParserOptions(); $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $options, true, true, $revid ); $edit->oldText = $this->getContent(); + $this->mPreparedEdit = $edit; + return $edit; } @@ -3257,13 +3649,13 @@ class Article { * @param $changed Whether or not the content actually changed */ public function editUpdates( $text, $summary, $minoredit, $timestamp_of_pagechange, $newid, $changed = true ) { - global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgParser, $wgEnableParserCache; + global $wgDeferredUpdateList, $wgMessageCache, $wgUser, $wgEnableParserCache; wfProfileIn( __METHOD__ ); # Parse the text # Be careful not to double-PST: $text is usually already PST-ed once - if( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) { + if ( !$this->mPreparedEdit || $this->mPreparedEdit->output->getFlag( 'vary-revision' ) ) { wfDebug( __METHOD__ . ": No prepared edit or vary-revision is set...\n" ); $editInfo = $this->prepareTextForEdit( $text, $newid ); } else { @@ -3272,7 +3664,7 @@ class Article { } # Save it to the parser cache - if( $wgEnableParserCache ) { + if ( $wgEnableParserCache ) { $popts = $this->getParserOptions(); $parserCache = ParserCache::singleton(); $parserCache->save( $editInfo->output, $this, $popts ); @@ -3284,15 +3676,17 @@ class Article { wfRunHooks( 'ArticleEditUpdates', array( &$this, &$editInfo, $changed ) ); - if( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) { - if( 0 == mt_rand( 0, 99 ) ) { + if ( wfRunHooks( 'ArticleEditUpdatesDeleteFromRecentchanges', array( &$this ) ) ) { + if ( 0 == mt_rand( 0, 99 ) ) { // Flush old entries from the `recentchanges` table; we do this on // random requests so as to avoid an increase in writes for no good reason global $wgRCMaxAge; + $dbw = wfGetDB( DB_MASTER ); $cutoff = $dbw->timestamp( time() - $wgRCMaxAge ); $recentchanges = $dbw->tableName( 'recentchanges' ); $sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$cutoff}'"; + $dbw->query( $sql ); } } @@ -3301,7 +3695,7 @@ class Article { $title = $this->mTitle->getPrefixedDBkey(); $shortTitle = $this->mTitle->getDBkey(); - if( 0 == $id ) { + if ( 0 == $id ) { wfProfileOut( __METHOD__ ); return; } @@ -3315,24 +3709,25 @@ class Article { # Don't do this if $changed = false otherwise some idiot can null-edit a # load of user talk pages and piss people off, nor if it's a minor edit # by a properly-flagged bot. - if( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed - && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) ) { - if( wfRunHooks('ArticleEditUpdateNewTalk', array( &$this ) ) ) { + if ( $this->mTitle->getNamespace() == NS_USER_TALK && $shortTitle != $wgUser->getTitleKey() && $changed + && !( $minoredit && $wgUser->isAllowed( 'nominornewtalk' ) ) + ) { + if ( wfRunHooks( 'ArticleEditUpdateNewTalk', array( &$this ) ) ) { $other = User::newFromName( $shortTitle, false ); - if( !$other ) { - wfDebug( __METHOD__.": invalid username\n" ); - } elseif( User::isIP( $shortTitle ) ) { + if ( !$other ) { + wfDebug( __METHOD__ . ": invalid username\n" ); + } elseif ( User::isIP( $shortTitle ) ) { // An anonymous user $other->setNewtalk( true ); - } elseif( $other->isLoggedIn() ) { + } elseif ( $other->isLoggedIn() ) { $other->setNewtalk( true ); } else { - wfDebug( __METHOD__. ": don't need to notify a nonexistent user\n" ); + wfDebug( __METHOD__ . ": don't need to notify a nonexistent user\n" ); } } } - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { $wgMessageCache->replace( $shortTitle, $text ); } @@ -3366,15 +3761,18 @@ class Article { public function setOldSubtitle( $oldid = 0 ) { global $wgLang, $wgOut, $wgUser, $wgRequest; - if( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) { + if ( !wfRunHooks( 'DisplayOldSubtitle', array( &$this, &$oldid ) ) ) { return; } + $unhide = $wgRequest->getInt( 'unhide' ) == 1; + # Cascade unhide param in links for easy deletion browsing $extraParams = array(); - if( $wgRequest->getVal('unhide') ) { + if ( $wgRequest->getVal( 'unhide' ) ) { $extraParams['unhide'] = 1; } + $revision = Revision::newFromId( $oldid ); $current = ( $oldid == $this->mLatest ); @@ -3453,31 +3851,24 @@ class Article { array( 'known', 'noclasses' ) ); - $cdel=''; - // Don't show useless link to people who cannot hide revisions - if( $wgUser->isAllowed('deleterevision') || ($revision->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) { - if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) { - // If revision was hidden from sysops - $cdel = wfMsgHtml( 'rev-delundel' ); + $cdel = ''; + + // User can delete revisions or view deleted revisions... + $canHide = $wgUser->isAllowed( 'deleterevision' ); + if ( $canHide || ( $revision->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) ) { + if ( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) { + $cdel = $sk->revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops } else { - $cdel = $sk->link( - SpecialPage::getTitleFor( 'Revisiondelete' ), - wfMsgHtml('rev-delundel'), - array(), - array( - 'type' => 'revision', - 'target' => urlencode( $this->mTitle->getPrefixedDbkey() ), - 'ids' => urlencode( $oldid ) - ), - array( 'known', 'noclasses' ) + $query = array( + 'type' => 'revision', + 'target' => $this->mTitle->getPrefixedDbkey(), + 'ids' => $oldid ); - // Bolden oversighted content - if( $revision->isDeleted( Revision::DELETED_RESTRICTED ) ) - $cdel = "$cdel"; + $cdel = $sk->revDeleteLink( $query, $revision->isDeleted( File::DELETED_RESTRICTED ), $canHide ); } - $cdel = "($cdel) "; + $cdel .= ' '; } - $unhide = $wgRequest->getInt('unhide') == 1 && $wgUser->matchEditToken( $wgRequest->getVal('token'), $oldid ); + # Show user links if allowed to see them. If hidden, then show them only if requested... $userlinks = $sk->revUserTools( $revision, !$unhide ); @@ -3489,7 +3880,7 @@ class Article { $r = "\n\t\t\t\t " . wfMsgExt( $infomsg, - array( 'parseinline', 'replaceafter' ), + array( 'parseinline', 'replaceafter' ), $td, $userlinks, $revision->getID(), @@ -3500,6 +3891,7 @@ class Article { "\n" . "\n\t\t\t\t \n\t\t\t"; + $wgOut->setSubtitle( $r ); } @@ -3507,10 +3899,13 @@ class Article { * This function is called right before saving the wikitext, * so we can do things like signatures and links-in-context. * - * @param $text String + * @param $text String article contents + * @return string article contents with altered wikitext markup (signatures + * converted, {{subst:}}, templates, etc.) */ public function preSaveTransform( $text ) { global $wgParser, $wgUser; + return $wgParser->preSaveTransform( $text, $this->mTitle, $wgUser, ParserOptions::newFromUser( $wgUser ) ); } @@ -3520,27 +3915,32 @@ class Article { * checkLastModified returns true if it has taken care of all * output to the client that is necessary for this request. * (that is, it has sent a cached version of the page) + * + * @return boolean true if cached version send, false otherwise */ protected function tryFileCache() { static $called = false; - if( $called ) { + + if ( $called ) { wfDebug( "Article::tryFileCache(): called twice!?\n" ); return false; } + $called = true; - if( $this->isFileCacheable() ) { + if ( $this->isFileCacheable() ) { $cache = new HTMLFileCache( $this->mTitle ); - if( $cache->isFileCacheGood( $this->mTouched ) ) { + if ( $cache->isFileCacheGood( $this->mTouched ) ) { wfDebug( "Article::tryFileCache(): about to load file\n" ); $cache->loadFromFileCache(); return true; } else { wfDebug( "Article::tryFileCache(): starting buffer\n" ); - ob_start( array(&$cache, 'saveToFileCache' ) ); + ob_start( array( &$cache, 'saveToFileCache' ) ); } } else { wfDebug( "Article::tryFileCache(): not cacheable\n" ); } + return false; } @@ -3550,45 +3950,52 @@ class Article { */ public function isFileCacheable() { $cacheable = false; - if( HTMLFileCache::useFileCache() ) { + + if ( HTMLFileCache::useFileCache() ) { $cacheable = $this->getID() && !$this->mRedirectedFrom; // Extension may have reason to disable file caching on some pages. - if( $cacheable ) { + if ( $cacheable ) { $cacheable = wfRunHooks( 'IsFileCacheable', array( &$this ) ); } } + return $cacheable; } /** * Loads page_touched and returns a value indicating if it should be used - * + * @return boolean true if not a redirect */ public function checkTouched() { - if( !$this->mDataLoaded ) { + if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return !$this->mIsRedirect; } /** * Get the page_touched field + * @return string containing GMT timestamp */ public function getTouched() { # Ensure that page data has been loaded - if( !$this->mDataLoaded ) { + if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return $this->mTouched; } /** * Get the page_latest field + * @return integer rev_id of current revision */ public function getLatest() { - if( !$this->mDataLoaded ) { + if ( !$this->mDataLoaded ) { $this->loadPageData(); } + return (int)$this->mLatest; } @@ -3614,7 +4021,7 @@ class Article { $revision->insertOn( $dbw ); $this->updateRevisionOn( $dbw, $revision ); - wfRunHooks( 'NewRevisionFromEditComplete', array($this, $revision, false, $wgUser) ); + wfRunHooks( 'NewRevisionFromEditComplete', array( $this, $revision, false, $wgUser ) ); wfProfileOut( __METHOD__ ); } @@ -3626,15 +4033,17 @@ class Article { */ public static function incViewCount( $id ) { $id = intval( $id ); - global $wgHitcounterUpdateFreq, $wgDBtype; + + global $wgHitcounterUpdateFreq; $dbw = wfGetDB( DB_MASTER ); $pageTable = $dbw->tableName( 'page' ); $hitcounterTable = $dbw->tableName( 'hitcounter' ); $acchitsTable = $dbw->tableName( 'acchits' ); - if( $wgHitcounterUpdateFreq <= 1 ) { + if ( $wgHitcounterUpdateFreq <= 1 ) { $dbw->query( "UPDATE $pageTable SET page_counter = page_counter + 1 WHERE page_id = $id" ); + return; } @@ -3643,41 +4052,44 @@ class Article { $dbw->query( "INSERT INTO $hitcounterTable (hc_id) VALUES ({$id})" ); - $checkfreq = intval( $wgHitcounterUpdateFreq/25 + 1 ); - if( (rand() % $checkfreq != 0) or ($dbw->lastErrno() != 0) ){ + $checkfreq = intval( $wgHitcounterUpdateFreq / 25 + 1 ); + if ( ( rand() % $checkfreq != 0 ) or ( $dbw->lastErrno() != 0 ) ) { # Most of the time (or on SQL errors), skip row count check $dbw->ignoreErrors( $oldignore ); + return; } - $res = $dbw->query("SELECT COUNT(*) as n FROM $hitcounterTable"); + $res = $dbw->query( "SELECT COUNT(*) as n FROM $hitcounterTable" ); $row = $dbw->fetchObject( $res ); $rown = intval( $row->n ); - if( $rown >= $wgHitcounterUpdateFreq ){ + + if ( $rown >= $wgHitcounterUpdateFreq ) { wfProfileIn( 'Article::incViewCount-collect' ); $old_user_abort = ignore_user_abort( true ); - if($wgDBtype == 'mysql') - $dbw->query("LOCK TABLES $hitcounterTable WRITE"); - $tabletype = $wgDBtype == 'mysql' ? "ENGINE=HEAP " : ''; - $dbw->query("CREATE TEMPORARY TABLE $acchitsTable $tabletype AS ". - "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable ". - 'GROUP BY hc_id'); - $dbw->query("DELETE FROM $hitcounterTable"); - if($wgDBtype == 'mysql') { - $dbw->query('UNLOCK TABLES'); - $dbw->query("UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n ". - 'WHERE page_id = hc_id'); - } - else { - $dbw->query("UPDATE $pageTable SET page_counter=page_counter + hc_n ". - "FROM $acchitsTable WHERE page_id = hc_id"); + $dbType = $dbw->getType(); + $dbw->lockTables( array(), array( 'hitcounter' ), __METHOD__, false ); + $tabletype = $dbType == 'mysql' ? "ENGINE=HEAP " : ''; + $dbw->query( "CREATE TEMPORARY TABLE $acchitsTable $tabletype AS " . + "SELECT hc_id,COUNT(*) AS hc_n FROM $hitcounterTable " . + 'GROUP BY hc_id', __METHOD__ ); + $dbw->delete( 'hitcounter', '*', __METHOD__ ); + $dbw->unlockTables( __METHOD__ ); + + if ( $dbType == 'mysql' ) { + $dbw->query( "UPDATE $pageTable,$acchitsTable SET page_counter=page_counter + hc_n " . + 'WHERE page_id = hc_id', __METHOD__ ); + } else { + $dbw->query( "UPDATE $pageTable SET page_counter=page_counter + hc_n " . + "FROM $acchitsTable WHERE page_id = hc_id", __METHOD__ ); } - $dbw->query("DROP TABLE $acchitsTable"); + $dbw->query( "DROP TABLE $acchitsTable", __METHOD__ ); ignore_user_abort( $old_user_abort ); wfProfileOut( 'Article::incViewCount-collect' ); } + $dbw->ignoreErrors( $oldignore ); } @@ -3692,14 +4104,14 @@ class Article { * * @param $title a title object */ - public static function onArticleCreate( $title ) { # Update existence markers on article/talk tabs... - if( $title->isTalkPage() ) { + if ( $title->isTalkPage() ) { $other = $title->getSubjectPage(); } else { $other = $title->getTalkPage(); } + $other->invalidateCache(); $other->purgeSquid(); @@ -3708,14 +4120,19 @@ class Article { $title->deleteTitleProtection(); } + /** + * Clears caches when article is deleted + */ public static function onArticleDelete( $title ) { global $wgMessageCache; + # Update existence markers on article/talk tabs... - if( $title->isTalkPage() ) { + if ( $title->isTalkPage() ) { $other = $title->getSubjectPage(); } else { $other = $title->getTalkPage(); } + $other->invalidateCache(); $other->purgeSquid(); @@ -3726,27 +4143,33 @@ class Article { HTMLFileCache::clearFileCache( $title ); # Messages - if( $title->getNamespace() == NS_MEDIAWIKI ) { + if ( $title->getNamespace() == NS_MEDIAWIKI ) { $wgMessageCache->replace( $title->getDBkey(), false ); } + # Images - if( $title->getNamespace() == NS_FILE ) { + if ( $title->getNamespace() == NS_FILE ) { $update = new HTMLCacheUpdate( $title, 'imagelinks' ); $update->doUpdate(); } + # User talk pages - if( $title->getNamespace() == NS_USER_TALK ) { + if ( $title->getNamespace() == NS_USER_TALK ) { $user = User::newFromName( $title->getText(), false ); $user->setNewtalk( false ); } + # Image redirects RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $title ); } /** * Purge caches on page update etc + * + * @param $title Title object + * @todo: verify that $title is always a Title object (and never false or null), add Title hint to parameter $title */ - public static function onArticleEdit( $title, $flags = '' ) { + public static function onArticleEdit( $title ) { global $wgDeferredUpdateList; // Invalidate caches of articles which include this page @@ -3770,6 +4193,7 @@ class Article { */ public function revert() { global $wgOut; + $wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); } @@ -3780,7 +4204,7 @@ class Article { public function info() { global $wgLang, $wgOut, $wgAllowPageInfo, $wgUser; - if( !$wgAllowPageInfo ) { + if ( !$wgAllowPageInfo ) { $wgOut->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); return; } @@ -3791,9 +4215,9 @@ class Article { $wgOut->setPageTitleActionText( wfMsg( 'info_short' ) ); $wgOut->setSubtitle( wfMsgHtml( 'infosubtitle' ) ); - if( !$this->mTitle->exists() ) { + if ( !$this->mTitle->exists() ) { $wgOut->addHTML( '' ); - if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { + if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) { // This doesn't quite make sense; the user is asking for // information about the _page_, not the message... -- RC $wgOut->addHTML( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) ); @@ -3803,6 +4227,7 @@ class Article { : 'noarticletextanon'; $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) ); } + $wgOut->addHTML( '' ); } else { $dbr = wfGetDB( DB_SLAVE ); @@ -3819,15 +4244,19 @@ class Article { $pageInfo = $this->pageCountInfo( $page ); $talkInfo = $this->pageCountInfo( $page->getTalkPage() ); - $wgOut->addHTML( "
- " . wfMsg("numwatchers", $wgLang->formatNum( $numwatchers ) ) . '
' ); - $wgOut->addHTML( "- " . wfMsg('numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '
'); - if( $talkInfo ) { - $wgOut->addHTML( '- ' . wfMsg("numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '
'); + $wgOut->addHTML( "' ); } } @@ -3837,13 +4266,15 @@ class Article { * on a given page. If page does not exist, returns false. * * @param $title Title object - * @return array + * @return mixed array or boolean false */ public function pageCountInfo( $title ) { $id = $title->getArticleId(); - if( $id == 0 ) { + + if ( $id == 0 ) { return false; } + $dbr = wfGetDB( DB_SLAVE ); $rev_clause = array( 'rev_page' => $id ); $edits = $dbr->selectField( @@ -3860,6 +4291,7 @@ class Article { __METHOD__, $this->getSelectOptions() ); + return array( 'edits' => $edits, 'authors' => $authors ); } @@ -3872,20 +4304,25 @@ class Article { public function getUsedTemplates() { $result = array(); $id = $this->mTitle->getArticleID(); - if( $id == 0 ) { + + if ( $id == 0 ) { return array(); } + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( array( 'templatelinks' ), array( 'tl_namespace', 'tl_title' ), array( 'tl_from' => $id ), __METHOD__ ); - if( $res !== false ) { - foreach( $res as $row ) { + + if ( $res !== false ) { + foreach ( $res as $row ) { $result[] = Title::makeTitle( $row->tl_namespace, $row->tl_title ); } } + $dbr->freeResult( $res ); + return $result; } @@ -3898,21 +4335,26 @@ class Article { public function getHiddenCategories() { $result = array(); $id = $this->mTitle->getArticleID(); - if( $id == 0 ) { + + if ( $id == 0 ) { return array(); } + $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( array( 'categorylinks', 'page_props', 'page' ), array( 'cl_to' ), array( 'cl_from' => $id, 'pp_page=page_id', 'pp_propname' => 'hiddencat', - 'page_namespace' => NS_CATEGORY, 'page_title=cl_to'), + 'page_namespace' => NS_CATEGORY, 'page_title=cl_to' ), __METHOD__ ); - if( $res !== false ) { - foreach( $res as $row ) { + + if ( $res !== false ) { + foreach ( $res as $row ) { $result[] = Title::makeTitle( NS_CATEGORY, $row->cl_to ); } } + $dbr->freeResult( $res ); + return $result; } @@ -3929,29 +4371,34 @@ class Article { # Redirect autosummaries $ot = Title::newFromRedirect( $oldtext ); $rt = Title::newFromRedirect( $newtext ); - if( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) { + + if ( is_object( $rt ) && ( !is_object( $ot ) || !$rt->equals( $ot ) || $ot->getFragment() != $rt->getFragment() ) ) { return wfMsgForContent( 'autoredircomment', $rt->getFullText() ); } # New page autosummaries - if( $flags & EDIT_NEW && strlen( $newtext ) ) { + if ( $flags & EDIT_NEW && strlen( $newtext ) ) { # If they're making a new article, give its text, truncated, in the summary. global $wgContLang; + $truncatedtext = $wgContLang->truncate( - str_replace("\n", ' ', $newtext), + str_replace( "\n", ' ', $newtext ), max( 0, 200 - strlen( wfMsgForContent( 'autosumm-new' ) ) ) ); + return wfMsgForContent( 'autosumm-new', $truncatedtext ); } # Blanking autosummaries - if( $oldtext != '' && $newtext == '' ) { + if ( $oldtext != '' && $newtext == '' ) { return wfMsgForContent( 'autosumm-blank' ); - } elseif( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500) { + } elseif ( strlen( $oldtext ) > 10 * strlen( $newtext ) && strlen( $newtext ) < 500 ) { # Removing more than 90% of the article global $wgContLang; + $truncatedtext = $wgContLang->truncate( $newtext, max( 0, 200 - strlen( wfMsgForContent( 'autosumm-replace' ) ) ) ); + return wfMsgForContent( 'autosumm-replace', $truncatedtext ); } @@ -3967,6 +4414,7 @@ class Article { * * @param $text String * @param $cache Boolean + * @param $parserOptions mixed ParserOptions object, or boolean false */ public function outputWikiText( $text, $cache = true, $parserOptions = false ) { global $wgOut; @@ -3974,11 +4422,16 @@ class Article { $this->mParserOutput = $this->getOutputFromWikitext( $text, $cache, $parserOptions ); $wgOut->addParserOutput( $this->mParserOutput ); } - + /** * This does all the heavy lifting for outputWikitext, except it returns the parser * output instead of sending it straight to $wgOut. Makes things nice and simple for, * say, embedding thread pages within a discussion system (LiquidThreads) + * + * @param $text string + * @param $cache boolean + * @param $parserOptions parsing options, defaults to false + * @return string containing parsed output */ public function getOutputFromWikitext( $text, $cache = true, $parserOptions = false ) { global $wgParser, $wgOut, $wgEnableParserCache, $wgUseFileCache; @@ -3987,46 +4440,58 @@ class Article { $parserOptions = $this->getParserOptions(); } - $time = -wfTime(); + $time = - wfTime(); $this->mParserOutput = $wgParser->parse( $text, $this->mTitle, $parserOptions, true, true, $this->getRevIdFetched() ); $time += wfTime(); # Timing hack - if( $time > 3 ) { + if ( $time > 3 ) { wfDebugLog( 'slow-parse', sprintf( "%-5.2f %s", $time, - $this->mTitle->getPrefixedDBkey())); + $this->mTitle->getPrefixedDBkey() ) ); } - if( $wgEnableParserCache && $cache && $this && $this->mParserOutput->getCacheTime() != -1 ) { + if ( $wgEnableParserCache && $cache && $this && $this->mParserOutput->getCacheTime() != -1 ) { $parserCache = ParserCache::singleton(); $parserCache->save( $this->mParserOutput, $this, $parserOptions ); } + // Make sure file cache is not used on uncacheable content. // Output that has magic words in it can still use the parser cache // (if enabled), though it will generally expire sooner. - if( $this->mParserOutput->getCacheTime() == -1 || $this->mParserOutput->containsOldMagic() ) { + if ( $this->mParserOutput->getCacheTime() == -1 || $this->mParserOutput->containsOldMagic() ) { $wgUseFileCache = false; } + $this->doCascadeProtectionUpdates( $this->mParserOutput ); + return $this->mParserOutput; } /** * Get parser options suitable for rendering the primary article wikitext + * @return mixed ParserOptions object or boolean false */ public function getParserOptions() { global $wgUser; + if ( !$this->mParserOptions ) { $this->mParserOptions = new ParserOptions( $wgUser ); $this->mParserOptions->setTidy( true ); $this->mParserOptions->enableLimitReport(); } + return $this->mParserOptions; } + /** + * Updates cascading protections + * + * @param $parserOutput mixed ParserOptions object, or boolean false + **/ + protected function doCascadeProtectionUpdates( $parserOutput ) { - if( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) { + if ( !$this->isCurrent() || wfReadOnly() || !$this->mTitle->areRestrictionsCascading() ) { return; } @@ -4046,10 +4511,12 @@ class Article { $res = $dbr->select( array( 'templatelinks' ), array( 'tl_namespace', 'tl_title' ), array( 'tl_from' => $id ), - __METHOD__ ); + __METHOD__ + ); global $wgContLang; - foreach( $res as $row ) { + + foreach ( $res as $row ) { $tlTemplates["{$row->tl_namespace}:{$row->tl_title}"] = true; } @@ -4065,7 +4532,7 @@ class Article { # Note that we simulate array_diff_key in PHP <5.0.x $templates_diff = array_diff_key( $poTemplates, $tlTemplates ); - if( count( $templates_diff ) > 0 ) { + if ( count( $templates_diff ) > 0 ) { # Whee, link updates time. $u = new LinksUpdate( $this->mTitle, $parserOutput, false ); $u->doUpdate(); @@ -4078,7 +4545,6 @@ class Article { * * @param $added array The names of categories that were added * @param $deleted array The names of categories that were deleted - * @return null */ public function updateCategoryCounts( $added, $deleted ) { $ns = $this->mTitle->getNamespace(); @@ -4091,28 +4557,33 @@ class Article { # # Sometimes I wish we had INSERT ... ON DUPLICATE KEY UPDATE. $insertCats = array_merge( $added, $deleted ); - if( !$insertCats ) { + if ( !$insertCats ) { # Okay, nothing to do return; } + $insertRows = array(); - foreach( $insertCats as $cat ) { - $insertRows[] = array( 'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ), - 'cat_title' => $cat ); + + foreach ( $insertCats as $cat ) { + $insertRows[] = array( + 'cat_id' => $dbw->nextSequenceValue( 'category_cat_id_seq' ), + 'cat_title' => $cat + ); } $dbw->insert( 'category', $insertRows, __METHOD__, 'IGNORE' ); $addFields = array( 'cat_pages = cat_pages + 1' ); $removeFields = array( 'cat_pages = cat_pages - 1' ); - if( $ns == NS_CATEGORY ) { + + if ( $ns == NS_CATEGORY ) { $addFields[] = 'cat_subcats = cat_subcats + 1'; $removeFields[] = 'cat_subcats = cat_subcats - 1'; - } elseif( $ns == NS_FILE ) { + } elseif ( $ns == NS_FILE ) { $addFields[] = 'cat_files = cat_files + 1'; $removeFields[] = 'cat_files = cat_files - 1'; } - if( $added ) { + if ( $added ) { $dbw->update( 'category', $addFields, @@ -4120,7 +4591,8 @@ class Article { __METHOD__ ); } - if( $deleted ) { + + if ( $deleted ) { $dbw->update( 'category', $removeFields, @@ -4129,20 +4601,25 @@ class Article { ); } } - - /** Lightweight method to get the parser output for a page, checking the parser cache - * and so on. Doesn't consider most of the stuff that Article::view is forced to - * consider, so it's not appropriate to use there. */ - function getParserOutput( $oldid = null ) { + + /** + * Lightweight method to get the parser output for a page, checking the parser cache + * and so on. Doesn't consider most of the stuff that Article::view is forced to + * consider, so it's not appropriate to use there. + * + * @param $oldid mixed integer Revision ID or null + */ + public function getParserOutput( $oldid = null ) { global $wgEnableParserCache, $wgUser, $wgOut; // Should the parser cache be used? $useParserCache = $wgEnableParserCache && - intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 && - $this->exists() && - $oldid === null; - - wfDebug( __METHOD__.': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" ); + intval( $wgUser->getOption( 'stubthreshold' ) ) == 0 && + $this->exists() && + $oldid === null; + + wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" ); + if ( $wgUser->getOption( 'stubthreshold' ) ) { wfIncrStats( 'pcache_miss_stub' ); } @@ -4155,7 +4632,7 @@ class Article { if ( $parserOutput === false ) { // Cache miss; parse and output it. $rev = Revision::newFromTitle( $this->getTitle(), $oldid ); - + return $this->getOutputFromWikitext( $rev->getText(), $useParserCache ); } else { return $parserOutput;
- " . wfMsg( "numwatchers", $wgLang->formatNum( $numwatchers ) ) . '
' ); + $wgOut->addHTML( "- " . wfMsg( 'numedits', $wgLang->formatNum( $pageInfo['edits'] ) ) . '
' ); + + if ( $talkInfo ) { + $wgOut->addHTML( '- ' . wfMsg( "numtalkedits", $wgLang->formatNum( $talkInfo['edits'] ) ) . '
' ); } - $wgOut->addHTML( '- ' . wfMsg("numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '
' ); - if( $talkInfo ) { - $wgOut->addHTML( '- ' . wfMsg('numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '
' ); + + $wgOut->addHTML( '- ' . wfMsg( "numauthors", $wgLang->formatNum( $pageInfo['authors'] ) ) . '
' ); + + if ( $talkInfo ) { + $wgOut->addHTML( '- ' . wfMsg( 'numtalkauthors', $wgLang->formatNum( $talkInfo['authors'] ) ) . '
' ); } + $wgOut->addHTML( '